From ff68c364d697fce3bec652216d0f48044146020e Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Mon, 4 Sep 2023 15:09:36 +0800 Subject: [PATCH] slang2: Remove pcre module pcre is obsolete and upstream has not yet migrated to pcre2. Signed-off-by: Jeffery To (cherry picked from commit 106304c988fddf0b66220a7ca04bbf2902719616) --- libs/slang2/Makefile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libs/slang2/Makefile b/libs/slang2/Makefile index dcd5bd9ebc..48a909f16c 100644 --- a/libs/slang2/Makefile +++ b/libs/slang2/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=slang PKG_VERSION:=2.3.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://www.jedsoft.org/releases/slang \ @@ -26,11 +26,10 @@ PKG_BUILD_PARALLEL:=0 PKG_CONFIG_DEPENDS:= \ CONFIG_BUILD_NLS \ CONFIG_PACKAGE_libslang2-mod-onig \ - CONFIG_PACKAGE_libslang2-mod-pcre \ CONFIG_PACKAGE_libslang2-mod-png \ CONFIG_PACKAGE_libslang2-mod-zlib -SLANG_MODULES:= base64 chksum csv fcntl fork histogram iconv json onig pcre \ +SLANG_MODULES:= base64 chksum csv fcntl fork histogram iconv json onig \ png rand select slsmg socket stats sysconf termios varray zlib include $(INCLUDE_DIR)/package.mk @@ -88,12 +87,6 @@ $(call Package/libslang2-mod/Default) DEPENDS+=+PACKAGE_libslang2-mod-onig:oniguruma endef -define Package/libslang2-mod-pcre -$(call Package/libslang2-mod/Default) - TITLE+= (pcre module) - DEPENDS+=+PACKAGE_libslang2-mod-pcre:libpcre -endef - define Package/libslang2-mod-png $(call Package/libslang2-mod/Default) TITLE+= (png module) @@ -126,10 +119,10 @@ CONFIGURE_ARGS+= \ --enable-warnings \ --with-readline=slang \ --with-terminfo=default \ + --without-pcre \ --without-x \ $(if $(CONFIG_BUILD_NLS),--with-iconv="$(ICONV_PREFIX)",--without-iconv) \ $(if $(CONFIG_PACKAGE_libslang2-mod-onig),--with-onig="$(STAGING_DIR)/usr",--without-onig) \ - $(if $(CONFIG_PACKAGE_libslang2-mod-pcre),--with-pcre="$(STAGING_DIR)/usr",--without-pcre) \ $(if $(CONFIG_PACKAGE_libslang2-mod-png),--with-png="$(STAGING_DIR)/usr",--without-png) \ $(if $(CONFIG_PACKAGE_libslang2-mod-zlib),--with-z="$(STAGING_DIR)/usr",--without-z) -- 2.30.2