-#
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2011 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-# $Id$
include $(TOPDIR)/rules.mk
PKG_NAME:=pcre
-PKG_VERSION:=7.2
+PKG_VERSION:=8.11
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/pcre
-PKG_MD5SUM:=53305db73855f1ff155dcd2c05d448d3
+PKG_MD5SUM:=ef907b8792ec7f90f0dcd773848f0b3b
+
+PKG_FIXUP:=autoreconf
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
-define Package/libpcre
+define Package/libpcre/default
SECTION:=libs
CATEGORY:=Libraries
- TITLE:=A Perl Compatible Regular Expression library
URL:=http://www.pcre.org/
endef
+define Package/libpcre
+ $(call Package/libpcre/default)
+ TITLE:=A Perl Compatible Regular Expression library
+endef
+
+define Package/libpcrecpp
+ $(call Package/libpcre/default)
+ TITLE:=C++ wrapper for Perl Compatible Regular Expression library
+ DEPENDS:=+libpcre
+endef
+
+
+TARGET_CFLAGS += $(FPIC)
+
CONFIGURE_ARGS += \
- --enable-shared \
- --enable-static \
--enable-utf8 \
- --disable-cpp
+ --enable-unicode-properties \
+
+ifneq ($(CONFIG_PACKAGE_libpcrecpp),)
+ CONFIGURE_ARGS+= --enable-cpp
+else
+ CONFIGURE_ARGS+= --disable-cpp
+endif
MAKE_FLAGS += \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- all
+ CFLAGS="$(TARGET_CFLAGS)"
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/
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(1)/usr/bin/
+
+ $(INSTALL_DIR) $(2)/bin
+ $(LN) $(STAGING_DIR)/usr/bin/pcre-config $(2)/bin
+
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/pcre*.h $(1)/usr/include/
+
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre*.{a,so*} $(1)/usr/lib//
+
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpcre*.pc $(1)/usr/lib/pkgconfig/
+
endef
define Package/libpcre/install
$(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
+
+define Package/libpcrecpp/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcrecpp.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libpcre))
+$(eval $(call BuildPackage,libpcrecpp))