glib2: use internal pcre2

For some strange reason, glib2 does not link properly with a static
pcre2. Work around by bundling own copy.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2024-02-10 18:20:13 -08:00
parent 0c39a397d2
commit 9f57ef2d6e
2 changed files with 7 additions and 4 deletions

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=glib2
PKG_VERSION:=2.78.4
PKG_RELEASE:=1
PKG_RELEASE:=2
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
MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Ddefault_library=static -Dnls=disabled -Dforce_fallback_for=libpcre2-8
MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -Ddefault_library=both -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled
define Build/InstallDev

View File

@ -1,8 +1,11 @@
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -402,6 +402,7 @@ pcre2_static_args = []
@@ -400,8 +400,9 @@ endif
if use_pcre2_static_flag
pcre2_static_args = []
-if use_pcre2_static_flag
+if pcre2.type_name() == 'internal'
pcre2_static_args = ['-DPCRE2_STATIC']
+ pcre2 = pcre2.as_link_whole()
endif