| 1 |
flameeyes 11/03/30 14:41:43 |
| 2 |
|
| 3 |
Added: ntfsprogs-2.0.0-cryptolink.patch |
| 4 |
Log: |
| 5 |
Revision bump: fix building with net-libs/gnutls[nettle] (bug #361307); avoid playing with configure to remove cflags mangling on USE=debug; only depend on libconfig when USE=crypt is enabled. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-cryptolink.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-cryptolink.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-cryptolink.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ntfsprogs-2.0.0-cryptolink.patch |
| 16 |
=================================================================== |
| 17 |
Index: ntfsprogs-2.0.0/ntfsprogs/Makefile.am |
| 18 |
=================================================================== |
| 19 |
--- ntfsprogs-2.0.0.orig/ntfsprogs/Makefile.am |
| 20 |
+++ ntfsprogs-2.0.0/ntfsprogs/Makefile.am |
| 21 |
@@ -124,9 +124,9 @@ ntfsdump_logfile_LDFLAGS= $(AM_LFLAGS) |
| 22 |
|
| 23 |
if ENABLE_CRYPTO |
| 24 |
ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h |
| 25 |
-ntfsdecrypt_LDADD = $(AM_LIBS) |
| 26 |
-ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs` |
| 27 |
-ntfsdecrypt_CFLAGS = `libgnutls-config --cflags` |
| 28 |
+ntfsdecrypt_LDADD = $(AM_LIBS) $(GNUTLS_LIBS) $(LIBGCRYPT_LIBS) |
| 29 |
+ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) |
| 30 |
+ntfsdecrypt_CFLAGS = $(GNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) |
| 31 |
endif |
| 32 |
|
| 33 |
# Extra targets |
| 34 |
Index: ntfsprogs-2.0.0/libntfs/Makefile.am |
| 35 |
=================================================================== |
| 36 |
--- ntfsprogs-2.0.0.orig/libntfs/Makefile.am |
| 37 |
+++ ntfsprogs-2.0.0/libntfs/Makefile.am |
| 38 |
@@ -34,12 +34,13 @@ linux_ntfsincludedir = -I$(top_srcdir)/i |
| 39 |
lib_LTLIBRARIES = libntfs.la |
| 40 |
|
| 41 |
libntfs_la_LDFLAGS = -version-info $(LTVERSION_LIBNTFS) -no-undefined |
| 42 |
+libntfs_la_LIBADD = |
| 43 |
libntfs_la_CFLAGS = $(LIBNTFS_CFLAGS) \ |
| 44 |
-DLTVERSION_LIBNTFS=\"$(LTVERSION_LIBNTFS)\" |
| 45 |
|
| 46 |
if ENABLE_CRYPTO |
| 47 |
-libntfs_la_LDFLAGS += `libgnutls-config --libs` `pkg-config --libs libconfig` |
| 48 |
-libntfs_la_CFLAGS += `libgnutls-config --cflags` `pkg-config --cflags libconfig` |
| 49 |
+libntfs_la_LIBADD += $(GNUTLS_LIBS) $(LIBGCRYPT_LIBS) $(libconfig_LIBS) |
| 50 |
+libntfs_la_CFLAGS += $(GNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(libconfig_CFLAGS) |
| 51 |
endif |
| 52 |
|
| 53 |
libntfs_la_SOURCES = \ |
Archives