enable $(FPIC) for a few more packages

[packages.git] / libs / pcre / Makefile

diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile
index a3229ce..ac039cc 100644 (file)
--- a/libs/pcre/Makefile
+++ b/libs/pcre/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,15 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pcre
-PKG_VERSION:=5.0
-PKG_RELEASE:=3
+PKG_VERSION:=7.6
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/pcre
-PKG_MD5SUM:=813850808894d99fb5b1c41ec6335d4f
-PKG_CAT:=bzcat
+PKG_MD5SUM:=2af38e083fb90ef60fa9eda7cc290e86
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,40 +27,25 @@ define Package/libpcre
   URL:=http://www.pcre.org/
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               --enable-utf8 \
-       )
-endef
+TARGET_CFLAGS += $(FPIC)
 
-define Build/Compile
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               CC_FOR_BUILD="$(HOSTCC)" \
-               LINK_FOR_BUILD="$(HOSTCC)" \
-               CFLAGS_FOR_BUILD="" \
-               dftables
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               all
-endef
+CONFIGURE_ARGS += \
+       --enable-shared \
+       --enable-static \
+       --enable-utf8 \
+       --disable-cpp \
 
-define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/bin
-       $(CP) $(PKG_BUILD_DIR)/pcre-config $(STAGING_DIR)/usr/bin/
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_BUILD_DIR)/pcre{,posix}.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/.libs/libpcre{,posix}.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
+MAKE_FLAGS += \
+       $(TARGET_CONFIGURE_OPTS) \
+       CFLAGS="$(TARGET_CFLAGS)" \
+       all \
 
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/bin/pcre-config \
-               $(STAGING_DIR)/usr/include/pcre{,posix}.h \
-               $(STAGING_DIR)/usr/lib/libpcre{,posix}.{a,so*}
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/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/
+       $(CP) $(PKG_BUILD_DIR)/.libs/libpcre{,posix}.{a,so*} $(1)/usr/lib/
 endef
 
 define Package/libpcre/install