summaryrefslogtreecommitdiff
path: root/openwrt/package/pcre/patches
diff options
context:
space:
mode:
Diffstat (limited to 'openwrt/package/pcre/patches')
-rw-r--r--openwrt/package/pcre/patches/100-honor_cppflags_ldflags.patch24
-rw-r--r--openwrt/package/pcre/patches/750-pcre_config_cross.patch27
2 files changed, 0 insertions, 51 deletions
diff --git a/openwrt/package/pcre/patches/100-honor_cppflags_ldflags.patch b/openwrt/package/pcre/patches/100-honor_cppflags_ldflags.patch
deleted file mode 100644
index 2d14b89..0000000
--- a/openwrt/package/pcre/patches/100-honor_cppflags_ldflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
diff --git a/openwrt/package/pcre/patches/750-pcre_config_cross.patch b/openwrt/package/pcre/patches/750-pcre_config_cross.patch
deleted file mode 100644
index c61a7f5..0000000
--- a/openwrt/package/pcre/patches/750-pcre_config_cross.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ruN pcre-5.0-old/pcre-config.in pcre-5.0-new/pcre-config.in
---- pcre-5.0-old/pcre-config.in 2004-09-13 16:20:00.000000000 +0200
-+++ pcre-5.0-new/pcre-config.in 2005-09-04 16:34:39.000000000 +0200
-@@ -18,6 +18,10 @@
- libR=" -R@libdir@"
- ;;
- esac
-+libS=
-+if test @libdir@ != /usr/lib ; then
-+ libS=-L@libdir@
-+fi
-
- while test $# -gt 0; do
- case "$1" in
-@@ -52,10 +56,10 @@
- echo $includes
- ;;
- --libs-posix)
-- echo -L@libdir@$libR -lpcreposix -lpcre
-+ echo $libS$libR -lpcreposix -lpcre
- ;;
- --libs)
-- echo -L@libdir@$libR -lpcre
-+ echo $libS$libR -lpcre
- ;;
- *)
- echo "${usage}" 1>&2