summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-15 21:41:50 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-03-15 21:41:50 +0000
commita0fdc52823a23104d3c924c9bfb36216ac21d066 (patch)
tree6bb33593e9f4c20cd6cba55fef233159301ec2fc
parent1f6c1db083ee952b14a033db44f3e0cfb567d1c2 (diff)
add a patch to use cppflags when compiling and ldflags when linking,
it should prevent libtool from linking against host libraries. git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3382 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/pcre/patches/100-honor_cppflags_ldflags.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/package/pcre/patches/100-honor_cppflags_ldflags.patch b/package/pcre/patches/100-honor_cppflags_ldflags.patch
new file mode 100644
index 000000000..2d14b8949
--- /dev/null
+++ b/package/pcre/patches/100-honor_cppflags_ldflags.patch
@@ -0,0 +1,24 @@
+diff -ruN pcre-5.0-old/Makefile.in pcre-5.0-new/Makefile.in
+--- pcre-5.0-old/Makefile.in 2004-09-13 16:20:00.000000000 +0200
++++ pcre-5.0-new/Makefile.in 2006-03-15 08:28:12.000000000 +0100
+@@ -63,6 +63,7 @@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
+
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+@@ -84,10 +85,10 @@
+ # to do one or the other or both by ./configure.
+
+ LIBTOOL = @LIBTOOL@
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -I. -I$(top_srcdir) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT) $(NO_RECURSE) $(EBCDIC)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) -I. -I$(top_srcdir) $(CPPFLAGS) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT) $(NO_RECURSE) $(EBCDIC)
+ @ON_WINDOWS@LINK = $(CC) $(CFLAGS) -I. -I$(top_srcdir) -L.libs
+ @NOT_ON_WINDOWS@LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -I. -I$(top_srcdir)
+-LINKLIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -I. -I$(top_srcdir)
++LINKLIB = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -I. -I$(top_srcdir) $(LDFLAGS)
+ LINK_FOR_BUILD = $(LIBTOOL) --mode=link $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -I$(top_srcdir)
+
+ # These are the version numbers for the shared libraries