bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] pcre: update to 8.02

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@20368 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
rhk 2010-03-22 14:25:18 +00:00
parent 24f0aebcf9
commit 415e4a4749
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libs/pcre/Makefile
View File

@ -8,14 +8,15 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=pcre PKG_NAME:=pcre
PKG_VERSION:=8.01 PKG_VERSION:=8.02
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/pcre PKG_SOURCE_URL:=@SF/pcre
PKG_MD5SUM:=413be1c23dabe91f637fb3770f640006 PKG_MD5SUM:=27948c1b5f5c1eabc23cba1ebe4c316f
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -29,27 +30,29 @@ endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--enable-shared \
--enable-static \
--enable-utf8 \ --enable-utf8 \
--disable-cpp \ --disable-cpp
MAKE_FLAGS += \ MAKE_FLAGS += \
$(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)"
CFLAGS="$(TARGET_CFLAGS)" \
all \
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/bin
$(CP) $(PKG_BUILD_DIR)/pcre-config $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(1)/usr/bin/
ln -sf $(STAGING_DIR)/usr/bin/pcre-config $(2)/bin
$(CP) $(PKG_BUILD_DIR)/pcre{,posix}.h $(1)/usr/include/ $(INSTALL_DIR) $(2)/bin
$(CP) $(PKG_BUILD_DIR)/.libs/libpcre{,posix}.{a,so*} $(1)/usr/lib/ $(LN) $(STAGING_DIR)/usr/bin/pcre-config $(2)/bin
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/pcre{,posix}.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.{a,so*} $(1)/usr/lib/
endef endef
define Package/libpcre/install define Package/libpcre/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_BUILD_DIR)/.libs/libpcre{,posix}.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so* $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,libpcre)) $(eval $(call BuildPackage,libpcre))

16
libs/pcre/patches/750-pcre_config_cross.patch
View File

@ -1,8 +1,6 @@
Index: pcre-7.6/pcre-config.in --- a/pcre-config.in
=================================================================== +++ b/pcre-config.in
--- pcre-7.6.orig/pcre-config.in 2008-02-16 11:13:56.000000000 +0100 @@ -24,6 +24,10 @@ case `uname -s` in
+++ pcre-7.6/pcre-config.in 2008-02-16 11:13:57.000000000 +0100
@@ -21,6 +21,10 @@
libR=" -Wl,-R@libdir@" libR=" -Wl,-R@libdir@"
;; ;;
esac esac
@ -13,8 +11,8 @@ Index: pcre-7.6/pcre-config.in
while test $# -gt 0; do while test $# -gt 0; do
case "$1" in case "$1" in
@@ -55,10 +59,10 @@ @@ -58,10 +62,10 @@ while test $# -gt 0; do
echo $includes echo $includes @PCRE_STATIC_CFLAG@
;; ;;
--libs-posix) --libs-posix)
- echo -L@libdir@$libR -lpcreposix -lpcre - echo -L@libdir@$libR -lpcreposix -lpcre
@ -24,5 +22,5 @@ Index: pcre-7.6/pcre-config.in
- echo -L@libdir@$libR -lpcre - echo -L@libdir@$libR -lpcre
+ echo $libS$libR -lpcre + echo $libS$libR -lpcre
;; ;;
*) --libs-cpp)
echo "${usage}" 1>&2 if test @enable_cpp@ = yes ; then