| 1 |
arfrever 09/05/29 23:52:01 |
| 2 |
|
| 3 |
Added: ntfsprogs-2.0.0-gnutls-2.8.patch |
| 4 |
Log: |
| 5 |
Fix building with >=net-libs/gnutls-2.7.1 (bug #268488). |
| 6 |
(Portage version: 13625-svn/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-gnutls-2.8.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-gnutls-2.8.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/ntfsprogs/files/ntfsprogs-2.0.0-gnutls-2.8.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: ntfsprogs-2.0.0-gnutls-2.8.patch |
| 15 |
=================================================================== |
| 16 |
--- libntfs/Makefile.am |
| 17 |
+++ libntfs/Makefile.am |
| 18 |
@@ -38,8 +38,8 @@ |
| 19 |
-DLTVERSION_LIBNTFS=\"$(LTVERSION_LIBNTFS)\" |
| 20 |
|
| 21 |
if ENABLE_CRYPTO |
| 22 |
-libntfs_la_LDFLAGS += `libgnutls-config --libs` `pkg-config --libs libconfig` |
| 23 |
-libntfs_la_CFLAGS += `libgnutls-config --cflags` `pkg-config --cflags libconfig` |
| 24 |
+libntfs_la_LDFLAGS += `pkg-config --libs gnutls libconfig` |
| 25 |
+libntfs_la_CFLAGS += `pkg-config --cflags gnutls libconfig` |
| 26 |
endif |
| 27 |
|
| 28 |
libntfs_la_SOURCES = \ |
| 29 |
--- libntfs/Makefile.in |
| 30 |
+++ libntfs/Makefile.in |
| 31 |
@@ -61,8 +61,8 @@ |
| 32 |
build_triplet = @build@ |
| 33 |
host_triplet = @host@ |
| 34 |
target_triplet = @target@ |
| 35 |
-@ENABLE_CRYPTO_TRUE@am__append_1 = `libgnutls-config --libs` `pkg-config --libs libconfig` |
| 36 |
-@ENABLE_CRYPTO_TRUE@am__append_2 = `libgnutls-config --cflags` `pkg-config --cflags libconfig` |
| 37 |
+@ENABLE_CRYPTO_TRUE@am__append_1 = `pkg-config --libs gnutls libconfig` |
| 38 |
+@ENABLE_CRYPTO_TRUE@am__append_2 = `pkg-config --cflags gnutls libconfig` |
| 39 |
subdir = libntfs |
| 40 |
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ |
| 41 |
$(srcdir)/libntfs-gnomevfs.8.in $(srcdir)/libntfs.8.in \ |
| 42 |
--- ntfsprogs/Makefile.am |
| 43 |
+++ ntfsprogs/Makefile.am |
| 44 |
@@ -125,8 +125,8 @@ |
| 45 |
if ENABLE_CRYPTO |
| 46 |
ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h |
| 47 |
ntfsdecrypt_LDADD = $(AM_LIBS) |
| 48 |
-ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs` |
| 49 |
-ntfsdecrypt_CFLAGS = `libgnutls-config --cflags` |
| 50 |
+ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `pkg-config --libs gnutls` |
| 51 |
+ntfsdecrypt_CFLAGS = `pkg-config --cflags gnutls` |
| 52 |
endif |
| 53 |
|
| 54 |
# Extra targets |
| 55 |
--- ntfsprogs/Makefile.in |
| 56 |
+++ ntfsprogs/Makefile.in |
| 57 |
@@ -449,8 +449,8 @@ |
| 58 |
ntfsdump_logfile_LDFLAGS = $(AM_LFLAGS) |
| 59 |
@ENABLE_CRYPTO_TRUE@ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h |
| 60 |
@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDADD = $(AM_LIBS) |
| 61 |
-@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs` |
| 62 |
-@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `libgnutls-config --cflags` |
| 63 |
+@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `pkg-config --libs gnutls` |
| 64 |
+@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `pkg-config --cflags gnutls` |
| 65 |
all: all-am |
| 66 |
|
| 67 |
.SUFFIXES: |
Archives