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>

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 7dc30ddd7e32754194167d96dd333468ad5fa218..27e30a8073fd66f4a9ba2282441da449e297ca45 100644 (file)
--- 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:=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

diff --git a/libs/glib2/patches/010-pcre.patch b/libs/glib2/patches/010-pcre.patch
index ead8f7f2335466f42b7ec0d0507f3c64a65c6729..b61341cdf2534a17d49753be864b4406c11a06a5 100644 (file)
--- a/libs/glib2/patches/010-pcre.patch
+++ b/libs/glib2/patches/010-pcre.patch
@@ -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