From: Jan Kardell <redacted>
Date: Sun, 10 Mar 2019 16:30:39 +0000 (+0100)
Subject: pcre: Fix compile of libpcrecpp
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=17090fecf18c795f5bfa5e1ea375ccd65d24f227;p=openwrt-packages.git

pcre: Fix compile of libpcrecpp

If the cpp lib is added after pcre is first compiled, pcre will
not be reconfigured and the build will fail.
Fix this by always building the cpp parts.

Signed-off-by: Jan Kardell <redacted>
---

diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile
index 3208aa7ac..945819e4c 100644
--- a/libs/pcre/Makefile
+++ b/libs/pcre/Makefile
@@ -55,12 +55,8 @@ CONFIGURE_ARGS += \
 	--enable-unicode-properties \
 	--enable-pcre16 \
 	--with-match-limit-recursion=16000 \
+	--enable-cpp
 
-ifneq ($(CONFIG_PACKAGE_libpcrecpp),)
-  CONFIGURE_ARGS+= --enable-cpp
-else
-  CONFIGURE_ARGS+= --disable-cpp
-endif
 
 MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CFLAGS)"