X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fpcre%2Fpatches%2F100-honor_cppflags_ldflags.patch;h=c90bb60bd8867d0e512c37fa93694d0ca66ae3ce;hp=2d14b894990b612ab35ed1b692b399a2e7e5d3b4;hb=6e7a08743a6116f7232455b5ed173e3f1bab905f;hpb=1570b57a8aaaea2df5c5496e13bc63d995614a13

diff --git a/libs/pcre/patches/100-honor_cppflags_ldflags.patch b/libs/pcre/patches/100-honor_cppflags_ldflags.patch
index 2d14b89499..c90bb60bd8 100644
--- a/libs/pcre/patches/100-honor_cppflags_ldflags.patch
+++ b/libs/pcre/patches/100-honor_cppflags_ldflags.patch
@@ -1,24 +1,12 @@
-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 @@
+diff -urN pcre-7.0/Makefile.in pcre-7.0.new/Makefile.in
+--- pcre-7.0/Makefile.in	2006-12-19 10:31:35.000000000 +0100
++++ pcre-7.0.new/Makefile.in	2007-01-01 21:43:22.000000000 +0100
+@@ -102,7 +102,7 @@
  # 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
+ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) -I. -I$(top_srcdir) $(NEWLINE) $(LINK_SIZE) $(MATCH_LIMIT) $(NO_RECURSE) $(EBCDIC)
+ @ON_WINDOWS@LINK = $(CC) $(LDFLAGS) -I. -I$(top_srcdir) -L.libs
+ @NOT_ON_WINDOWS@LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -I. -I$(top_srcdir)