From e3e6652a550df389ffc0b1ba1f57bdfb81d34a46 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Wed, 17 May 2023 22:39:20 +0200 Subject: [PATCH] pcre: move package to packages feed With the update of selinux no package depends anymore on pcre in the base repository. Move it to packages feed. Signed-off-by: Nick Hainke --- package/libs/pcre/Config.in | 11 --- package/libs/pcre/Makefile | 129 ------------------------------------ 2 files changed, 140 deletions(-) delete mode 100644 package/libs/pcre/Config.in delete mode 100644 package/libs/pcre/Makefile diff --git a/package/libs/pcre/Config.in b/package/libs/pcre/Config.in deleted file mode 100644 index 15e75fc753..0000000000 --- a/package/libs/pcre/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config PCRE_JIT_ENABLED - bool - depends on PACKAGE_libpcre && (arm || i386 || i686 || x86_64 || mips || mipsel || powerpc || sparc) - default y if (arm || i686 || x86_64) - prompt "Enable JIT compiler support" - help - Enable JIT (Just-In-Time) compiler support. - - Enabling this option can give an about 10x performance increase on JIT operations. It can be desireable for e.g. high performance Apache mod_rewrite or HA-Proxy reqrep operations. - - However, JIT should _only_ be enabled on architectures that are supported. Enabling JIT on unsupported platforms will result in a compilation failure. A list of supported architectures can be found here: https://pcre.org/original/doc/html/pcrejit.html#SEC3 . diff --git a/package/libs/pcre/Makefile b/package/libs/pcre/Makefile deleted file mode 100644 index 894f39b7d1..0000000000 --- a/package/libs/pcre/Makefile +++ /dev/null @@ -1,129 +0,0 @@ -# -# Copyright (C) 2006-2015 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=pcre -PKG_VERSION:=8.45 -PKG_RELEASE:=$(AUTORELEASE) - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8 - -PKG_MAINTAINER:=Thomas Heil -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=LICENCE -PKG_CPE_ID:=cpe:/a:pcre:pcre - -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 - -PKG_CONFIG_DEPENDS:=\ - CONFIG_PACKAGE_libpcrecpp \ - CONFIG_PCRE_JIT_ENABLED - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host-build.mk - -define Package/libpcre/default - SECTION:=libs - CATEGORY:=Libraries - URL:=https://www.pcre.org/ -endef - -define Package/libpcre/config - source "$(SOURCE)/Config.in" -endef - -define Package/libpcre - $(call Package/libpcre/default) - TITLE:=A Perl Compatible Regular Expression library -endef - -define Package/libpcre16 - $(call Package/libpcre/default) - TITLE:=A Perl Compatible Regular Expression library (16bit support) -endef - -define Package/libpcre32 - $(call Package/libpcre/default) - TITLE:=A Perl Compatible Regular Expression library (32bit support) -endef - -define Package/libpcrecpp - $(call Package/libpcre/default) - TITLE:=C++ wrapper for Perl Compatible Regular Expression library - DEPENDS:=+libpcre +libstdcpp -endef - -HOST_CONFIGURE_ARGS += \ - --disable-shared \ - --enable-utf8 \ - --enable-unicode-properties \ - --enable-pcre16 \ - --with-match-limit-recursion=16000 \ - --enable-cpp \ - --with-pic - -CONFIGURE_ARGS += \ - --enable-utf8 \ - --enable-unicode-properties \ - --enable-pcre16 \ - --enable-pcre32 \ - $(if $(CONFIG_PCRE_JIT_ENABLED),--enable-jit,--disable-jit) \ - --with-match-limit-recursion=16000 \ - --$(if $(CONFIG_PACKAGE_libpcrecpp),en,dis)able-cpp \ - --with-pic - -MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS)" - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(1)/usr/bin/ - $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/pcre-config - - $(INSTALL_DIR) $(2)/bin - $(LN) $(STAGING_DIR)/usr/bin/pcre-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 - -define Package/libpcre/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre.so $(1)/usr/lib/ -endef - -define Package/libpcre16/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre16.so* $(1)/usr/lib/ -endef - -define Package/libpcre32/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre32.so* $(1)/usr/lib/ -endef - -define Package/libpcrecpp/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcrecpp.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libpcre)) -$(eval $(call BuildPackage,libpcre16)) -$(eval $(call BuildPackage,libpcre32)) -$(eval $(call BuildPackage,libpcrecpp)) -$(eval $(call HostBuild)) -- 2.30.2