diff options
Diffstat (limited to 'package/libs')
| -rw-r--r-- | package/libs/pcre/Makefile | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/package/libs/pcre/Makefile b/package/libs/pcre/Makefile index 37d939da7f..8644746b4b 100644 --- a/package/libs/pcre/Makefile +++ b/package/libs/pcre/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcre PKG_VERSION:=8.44 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/$(PKG_NAME) @@ -24,10 +24,8 @@ PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 PKG_CONFIG_DEPENDS:=\ - CONFIG_PACKAGE_libpcrecpp \ CONFIG_PCRE_JIT_ENABLED -include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk @@ -56,19 +54,12 @@ define Package/libpcre32 TITLE:=A Perl Compatible Regular Expression library (32bit support) endef -define Package/libpcrecpp - $(call Package/libpcre/default) - TITLE:=C++ wrapper for Perl Compatible Regular Expression library - DEPENDS:=+libpcre $(CXX_DEPENDS) -endef - - HOST_CONFIGURE_ARGS += \ --enable-utf8 \ --enable-unicode-properties \ --enable-pcre16 \ --with-match-limit-recursion=16000 \ - --enable-cpp + --disable-cpp TARGET_CFLAGS += $(FPIC) @@ -79,7 +70,7 @@ CONFIGURE_ARGS += \ --enable-pcre32 \ $(if $(CONFIG_PCRE_JIT_ENABLED),--enable-jit,--disable-jit) \ --with-match-limit-recursion=16000 \ - $(if $(CONFIG_PACKAGE_libpcrecpp),--enable,--disable)-cpp + -disable-cpp MAKE_FLAGS += \ CFLAGS="$(TARGET_CFLAGS)" @@ -118,13 +109,7 @@ define Package/libpcre32/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre32.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,libpcre16)) $(eval $(call BuildPackage,libpcre32)) -$(eval $(call BuildPackage,libpcrecpp)) $(eval $(call HostBuild)) |