From 663b2edcd2be99638842edaf0406f4c984f32918 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Apr 2022 22:00:14 +0200 Subject: [PATCH] package/libselinux: switch to pcre2 Switch to pcre2 which is available since version 3.2 and https://github.com/SELinuxProject/selinux/commit/50f0910cf05bdc1d10710c7c3fb748a178473387 as pcre is EOL pcre2 is used by default since version 3.4 and https://github.com/SELinuxProject/selinux/commit/e0da140d82c0ebebf1060ce87d0f11276c7fc59a Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libselinux/Config.in | 2 +- package/libselinux/libselinux.mk | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/libselinux/Config.in b/package/libselinux/Config.in index 348757abce..3098fe3ea4 100644 --- a/package/libselinux/Config.in +++ b/package/libselinux/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBSELINUX depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libsepol select BR2_PACKAGE_LIBSEPOL - select BR2_PACKAGE_PCRE + select BR2_PACKAGE_PCRE2 select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC help libselinux is the runtime SELinux library that provides diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index c6be8e638a..db35da130f 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -11,7 +11,7 @@ LIBSELINUX_LICENSE_FILES = LICENSE LIBSELINUX_CPE_ID_VENDOR = selinuxproject LIBSELINUX_DEPENDENCIES = \ - $(BR2_COREUTILS_HOST_DEPENDENCY) host-pkgconf libsepol pcre + $(BR2_COREUTILS_HOST_DEPENDENCY) host-pkgconf libsepol pcre2 LIBSELINUX_INSTALL_STAGING = YES @@ -20,7 +20,8 @@ LIBSELINUX_INSTALL_STAGING = YES LIBSELINUX_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ ARCH=$(NORMALIZED_ARCH) \ - SHLIBDIR=/usr/lib + SHLIBDIR=/usr/lib \ + USE_PCRE2=y LIBSELINUX_MAKE_INSTALL_TARGETS = install @@ -76,14 +77,15 @@ define LIBSELINUX_INSTALL_TARGET_CMDS endef HOST_LIBSELINUX_DEPENDENCIES = \ - host-pkgconf host-libsepol host-pcre host-swig host-python3 + host-pkgconf host-libsepol host-pcre2 host-swig host-python3 HOST_LIBSELINUX_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ PREFIX=$(HOST_DIR) \ SHLIBDIR=$(HOST_DIR)/lib \ $(HOST_PKG_PYTHON_DISTUTILS_ENV) \ - PYTHON=python$(PYTHON3_VERSION_MAJOR) + PYTHON=python$(PYTHON3_VERSION_MAJOR) \ + USE_PCRE2=y define HOST_LIBSELINUX_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \