From 24248b6f7c248a3be6d90e12e6e24ac38401118b Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Thu, 4 Jul 2024 07:35:44 +0200 Subject: [PATCH] libs/glib2: remove pcre2 fallback workaround pcre2 can now be properly linked statically. Hence, remove both the patch and -Dforce_fallback_for=libpcre2-8 option. Signed-off-by: Yegor Yefremov --- libs/glib2/Makefile | 2 +- libs/glib2/patches/010-pcre.patch | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 libs/glib2/patches/010-pcre.patch diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index 3c2e359d7e..14032e4bfe 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -68,7 +68,7 @@ COMP_ARGS+=-Dintrospection=disabled # set runtime dir to /var/run COMP_ARGS+=-Druntime_dir=/var/run -MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Ddefault_library=static -Dnls=disabled -Dforce_fallback_for=libpcre2-8 +MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Ddefault_library=static -Dnls=disabled MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -Ddefault_library=both -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled define Build/InstallDev diff --git a/libs/glib2/patches/010-pcre.patch b/libs/glib2/patches/010-pcre.patch deleted file mode 100644 index 2ce2a7b82e..0000000000 --- a/libs/glib2/patches/010-pcre.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/glib/meson.build -+++ b/glib/meson.build -@@ -404,6 +404,7 @@ pcre2_static_args = [] - - if use_pcre2_static_flag - pcre2_static_args = ['-DPCRE2_STATIC'] -+ pcre2 = pcre2.as_link_whole() - endif - - glib_c_args = ['-DG_LOG_DOMAIN="GLib"'] + glib_c_args_internal + pcre2_static_args -- 2.30.2