Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pcre: remove unnecessary dependency on C++ lib

Browse source 
Add libpcrecpp to PKG_CONFIG_DEPENDS to properly trigger
reconfiguration, avoiding unnecessary dependency.

This reverts commit 17090fecf1.
This reverts commit ec138f51ab.

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
(cherry-picked from 41814de0fc)
This commit is contained in:
DENG Qingfang 2019-07-23 14:01:29 +08:00 committed by Rosen Penev
parent e91e3fd6ad
commit 39001de7b0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/pcre/Makefile
View file

@ -24,6 +24,8 @@ PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_CONFIG_DEPENDS := CONFIG_PACKAGE_libpcrecpp
include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -31,7 +33,6 @@ define Package/libpcre/default
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
URL:=https://www.pcre.org/ URL:=https://www.pcre.org/
DEPENDS:=$(CXX_DEPENDS)
endef endef
define Package/libpcre define Package/libpcre
@ -47,7 +48,7 @@ endef
define Package/libpcrecpp define Package/libpcrecpp
$(call Package/libpcre/default) $(call Package/libpcre/default)
TITLE:=C++ wrapper for Perl Compatible Regular Expression library TITLE:=C++ wrapper for Perl Compatible Regular Expression library
DEPENDS:=+libpcre DEPENDS:=+libpcre $(CXX_DEPENDS)
endef endef
TARGET_CFLAGS += $(FPIC) TARGET_CFLAGS += $(FPIC)
@ -57,8 +58,7 @@ CONFIGURE_ARGS += \
--enable-unicode-properties \ --enable-unicode-properties \
--enable-pcre16 \ --enable-pcre16 \
--with-match-limit-recursion=16000 \ --with-match-limit-recursion=16000 \
--enable-cpp $(if $(CONFIG_PACKAGE_libpcrecpp),--enable,--disable)-cpp
MAKE_FLAGS += \ MAKE_FLAGS += \
CFLAGS="$(TARGET_CFLAGS)" CFLAGS="$(TARGET_CFLAGS)"