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

Merge pull request #12827 from neheb/pcre22

Browse source 
pcre2: switch to CMake
This commit is contained in:
Rosen Penev 2020-07-16 13:29:43 -07:00 committed by GitHub
commit 24504d884f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
libs/pcre2/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pcre2 PKG_NAME:=pcre2
PKG_VERSION:=10.35 PKG_VERSION:=10.35
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/pcre/$(PKG_NAME)/$(PKG_VERSION) PKG_SOURCE_URL:=@SF/pcre/$(PKG_NAME)/$(PKG_VERSION)
@ -20,13 +20,14 @@ PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENCE PKG_LICENSE_FILES:=LICENCE
PKG_CPE_ID:=cpe:/a:pcre:pcre PKG_CPE_ID:=cpe:/a:pcre:pcre
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:=\ PKG_CONFIG_DEPENDS:=\
CONFIG_PACKAGE_libpcre2-16 \
CONFIG_PACKAGE_libpcre2-32 \
CONFIG_PCRE2_JIT_ENABLED CONFIG_PCRE2_JIT_ENABLED
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
define Package/libpcre2/default define Package/libpcre2/default
SECTION:=libs SECTION:=libs
@ -48,37 +49,28 @@ define Package/libpcre2-16
TITLE:=A Perl Compatible Regular Expression library (16bit support) TITLE:=A Perl Compatible Regular Expression library (16bit support)
endef endef
define Package/libpcre2-32 define Package/libpcre2-32
$(call Package/libpcre2/default) $(call Package/libpcre2/default)
TITLE:=A Perl Compatible Regular Expression library (32bit support) TITLE:=A Perl Compatible Regular Expression library (32bit support)
endef endef
TARGET_CFLAGS += $(FPIC) CMAKE_OPTIONS += \
-DBUILD_SHARED_LIBS=ON \
CONFIGURE_ARGS += \ -DPCRE2_BUILD_PCRE2_8=ON \
--enable-pcre2-16 \ -DPCRE2_BUILD_PCRE2_16=O$(if $(CONFIG_PACKAGE_libpcre2-16),N,FF) \
--enable-pcre2-32 \ -DPCRE2_BUILD_PCRE2_32=O$(if $(CONFIG_PACKAGE_libpcre2-32),N,FF) \
$(if $(CONFIG_PCRE2_JIT_ENABLED),--enable-jit,--disable-jit) -DPCRE2_DEBUG=OFF \
-DPCRE2_DISABLE_PERCENT_ZT=ON \
MAKE_FLAGS += \ -DPCRE2_SUPPORT_JIT=O$(if $(CONFIG_PCRE2_JIT_ENABLED),N,FF) \
CFLAGS="$(TARGET_CFLAGS)" -DPCRE2_SHOW_REPORT=OFF \
-DPCRE2_BUILD_PCRE2GREP=OFF \
-DPCRE2_BUILD_TESTS=OFF
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/bin $(call Build/InstallDev/cmake,$(1))
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pcre2-config $(1)/usr/bin/ $(SED) \
's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
$(INSTALL_DIR) $(2)/bin $(1)/usr/bin/pcre2-config
$(LN) $(STAGING_DIR)/usr/bin/pcre2-config $(2)/bin
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/pcre*.h $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre*.{a,so*} $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpcre*.pc $(1)/usr/lib/pkgconfig/
endef endef
define Package/libpcre2/install define Package/libpcre2/install
@ -96,8 +88,6 @@ define Package/libpcre2-32/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre2-32.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre2-32.so* $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,libpcre2)) $(eval $(call BuildPackage,libpcre2))
$(eval $(call BuildPackage,libpcre2-16)) $(eval $(call BuildPackage,libpcre2-16))
$(eval $(call BuildPackage,libpcre2-32)) $(eval $(call BuildPackage,libpcre2-32))