From: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Date: Tue, 23 Jul 2019 06:01:29 +0000 (+0800)
Subject: pcre: remove unnecessary dependency on C++ lib
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=41814de0fcc52ce055102ab2f81870bccf884b12;p=feed%2Fpackages.git

pcre: remove unnecessary dependency on C++ lib

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

This reverts commit 17090fecf18c795f5bfa5e1ea375ccd65d24f227.
This reverts commit ec138f51ab54873252bbe3e848f5fa9c20de78b9.

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
---

diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile
index 8d1cc09b1c..3dd7c728ee 100644
--- a/libs/pcre/Makefile
+++ b/libs/pcre/Makefile
@@ -23,6 +23,8 @@ PKG_FIXUP:=autoreconf
 
 PKG_INSTALL:=1
 
+PKG_CONFIG_DEPENDS := CONFIG_PACKAGE_libpcrecpp
+
 include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,7 +32,6 @@ define Package/libpcre/default
   SECTION:=libs
   CATEGORY:=Libraries
   URL:=https://www.pcre.org/
-  DEPENDS:=$(CXX_DEPENDS)
 endef
 
 define Package/libpcre
@@ -46,7 +47,7 @@ endef
 define Package/libpcrecpp
   $(call Package/libpcre/default)
   TITLE:=C++ wrapper for Perl Compatible Regular Expression library
-  DEPENDS:=+libpcre
+  DEPENDS:=+libpcre $(CXX_DEPENDS)
 endef
 
 TARGET_CFLAGS += $(FPIC)
@@ -56,8 +57,7 @@ CONFIGURE_ARGS += \
 	--enable-unicode-properties \
 	--enable-pcre16 \
 	--with-match-limit-recursion=16000 \
-	--enable-cpp
-
+	$(if $(CONFIG_PACKAGE_libpcrecpp),--enable,--disable)-cpp
 
 MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CFLAGS)"