From 5d7903a68c74c52a925e5968087a0a022b8ca916 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 1 Jan 2007 20:48:42 +0000
Subject: [PATCH] Upgrade pcre to 7.0 (#1119)

SVN-Revision: 5955
---
 libs/pcre/Makefile                            |  6 ++---
 .../patches/100-honor_cppflags_ldflags.patch  | 26 +++++--------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile
index a3229cefc..ce403f7b5 100644
--- a/libs/pcre/Makefile
+++ b/libs/pcre/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pcre
-PKG_VERSION:=5.0
-PKG_RELEASE:=3
+PKG_VERSION:=7.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/pcre
-PKG_MD5SUM:=813850808894d99fb5b1c41ec6335d4f
+PKG_MD5SUM:=b97e3bb84bd665e0fbb7a90344d65a43
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
diff --git a/libs/pcre/patches/100-honor_cppflags_ldflags.patch b/libs/pcre/patches/100-honor_cppflags_ldflags.patch
index 2d14b8949..c90bb60bd 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)
-- 
2.30.2