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

Merge pull request #9535 from dengqf6/pcre

Browse source 
pcre: remove unnecessary dependency on C++ lib
This commit is contained in:
Rosen Penev 2019-07-25 10:33:08 -07:00 committed by GitHub
commit 83b354dbd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -23,6 +23,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
@ -30,7 +32,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
@ -46,7 +47,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)
@ -56,8 +57,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)"