From 445f75e3f16adcf3b5f419a97284f4612eacd3fc Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 16 Feb 2024 10:16:10 +0100 Subject: [PATCH] Revert "glib2: use internal pcre2" This is must also get revert to get back to working glib2 version 2.74.0 Signed-off-by: Florian Eckert This reverts commit 9f57ef2d6e339231278f36614d9b2fdd275a9339. --- libs/glib2/Makefile | 4 ++-- libs/glib2/patches/010-pcre.patch | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index 27e30a8073..7dc30ddd7e 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glib2 PKG_VERSION:=2.78.4 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/glib/$(basename $(PKG_VERSION)) @@ -55,7 +55,7 @@ COMP_ARGS= \ -Dglib_checks=true \ -Dlibelf=disabled -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 index b61341cdf2..ead8f7f233 100644 --- a/libs/glib2/patches/010-pcre.patch +++ b/libs/glib2/patches/010-pcre.patch @@ -1,11 +1,8 @@ --- a/glib/meson.build +++ b/glib/meson.build -@@ -400,8 +400,9 @@ endif +@@ -402,6 +402,7 @@ pcre2_static_args = [] - pcre2_static_args = [] - --if use_pcre2_static_flag -+if pcre2.type_name() == 'internal' + if use_pcre2_static_flag pcre2_static_args = ['-DPCRE2_STATIC'] + pcre2 = pcre2.as_link_whole() endif -- 2.30.2