From 6b05a95d339248aec98d4fd8a93477cbdd2205e0 Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 10 Jul 2010 00:09:26 +0000 Subject: [PATCH] [packages] ntfsprogs: fix build failure * add a patch to prevent use of pkgconfig & config scripts in Makefiles after configure has been run git-svn-id: svn://svn.openwrt.org/openwrt/packages@22108 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- utils/ntfsprogs/patches/001-autoconf_fixes.patch | 52 ++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 utils/ntfsprogs/patches/001-autoconf_fixes.patch diff --git a/utils/ntfsprogs/patches/001-autoconf_fixes.patch b/utils/ntfsprogs/patches/001-autoconf_fixes.patch new file mode 100644 index 000000000..005515919 --- /dev/null +++ b/utils/ntfsprogs/patches/001-autoconf_fixes.patch @@ -0,0 +1,52 @@ +--- a/libntfs/Makefile.am ++++ b/libntfs/Makefile.am +@@ -38,8 +38,8 @@ libntfs_la_CFLAGS = $(LIBNTFS_CFLAGS) \ + -DLTVERSION_LIBNTFS=\"$(LTVERSION_LIBNTFS)\" + + if ENABLE_CRYPTO +-libntfs_la_LDFLAGS += `libgnutls-config --libs` `pkg-config --libs libconfig` +-libntfs_la_CFLAGS += `libgnutls-config --cflags` `pkg-config --cflags libconfig` ++libntfs_la_LDFLAGS += $(GNUTLS_LIBS) $(libconfig_LIBS) ++libntfs_la_CFLAGS += $(GNUTLS_CFLAGS) $(libconfig_CFLAGS) + endif + + libntfs_la_SOURCES = \ +--- a/libntfs/Makefile.in ++++ b/libntfs/Makefile.in +@@ -61,8 +61,8 @@ POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ + target_triplet = @target@ +-@ENABLE_CRYPTO_TRUE@am__append_1 = `libgnutls-config --libs` `pkg-config --libs libconfig` +-@ENABLE_CRYPTO_TRUE@am__append_2 = `libgnutls-config --cflags` `pkg-config --cflags libconfig` ++@ENABLE_CRYPTO_TRUE@am__append_1 = $(GNUTLS_LIBS) $(libconfig_LIBS) ++@ENABLE_CRYPTO_TRUE@am__append_2 = $(GNUTLS_CFLAGS) $(libconfig_CFLAGS) + subdir = libntfs + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/libntfs-gnomevfs.8.in $(srcdir)/libntfs.8.in \ +--- a/ntfsprogs/Makefile.am ++++ b/ntfsprogs/Makefile.am +@@ -125,8 +125,8 @@ ntfsdump_logfile_LDFLAGS= $(AM_LFLAGS) + if ENABLE_CRYPTO + ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h + ntfsdecrypt_LDADD = $(AM_LIBS) +-ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs` +-ntfsdecrypt_CFLAGS = `libgnutls-config --cflags` ++ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) $(GNUTLS_LIBS) ++ntfsdecrypt_CFLAGS = $(GNUTLS_CFLAGS) + endif + + # Extra targets +--- a/ntfsprogs/Makefile.in ++++ b/ntfsprogs/Makefile.in +@@ -449,8 +449,8 @@ ntfsdump_logfile_LDADD = $(AM_LIBS) + ntfsdump_logfile_LDFLAGS = $(AM_LFLAGS) + @ENABLE_CRYPTO_TRUE@ntfsdecrypt_SOURCES = ntfsdecrypt.c utils.c utils.h + @ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDADD = $(AM_LIBS) +-@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) `libgnutls-config --libs` +-@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = `libgnutls-config --cflags` ++@ENABLE_CRYPTO_TRUE@ntfsdecrypt_LDFLAGS = $(AM_LFLAGS) $(GNUTLS_LIBS) ++@ENABLE_CRYPTO_TRUE@ntfsdecrypt_CFLAGS = $(GNUTLS_CFLAGS) + all: all-am + + .SUFFIXES: -- 2.11.0