From 39001de7b042cb4555e23abb8456c6fe5d060db7 Mon Sep 17 00:00:00 2001 From: DENG Qingfang Date: Tue, 23 Jul 2019 14:01:29 +0800 Subject: [PATCH] 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 (cherry-picked from 41814de0fcc52ce055102ab2f81870bccf884b12) --- libs/pcre/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile index e225f29b5b..720142332b 100644 --- a/libs/pcre/Makefile +++ b/libs/pcre/Makefile @@ -24,6 +24,8 @@ PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +PKG_CONFIG_DEPENDS := CONFIG_PACKAGE_libpcrecpp + include $(INCLUDE_DIR)/uclibc++.mk include $(INCLUDE_DIR)/package.mk @@ -31,7 +33,6 @@ define Package/libpcre/default SECTION:=libs CATEGORY:=Libraries URL:=https://www.pcre.org/ - DEPENDS:=$(CXX_DEPENDS) endef define Package/libpcre @@ -47,7 +48,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) @@ -57,8 +58,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)" -- 2.30.2