From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 27 Nov 2023 10:17:48 +0000 (+0100)
Subject: glib-2.0: install gio-querymodules into bindir as well as libexecdir for native
X-Git-Tag: yocto-5.2~4475
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd530108e1b31ff3dff9e677e8e5af920e6609aa;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

glib-2.0: install gio-querymodules into bindir as well as libexecdir for native

Latest meson expects it there and fails if it can't find it; meanwhile
we patch glib to put it into libexecdir for reasons of avoiding incorrect
debian package renaming in multilib scenarios.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index cec06b2f88e..fbf3a39b15f 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -113,6 +113,11 @@ do_install:append () {
         mkdir -p ${D}${libdir}/gio/modules
 }
 
+do_install:append:class-native () {
+	# Link gio-querymodules into ${bindir} as otherwise tools like meson won't find it
+        ln -rs ${D}${libexecdir}/gio-querymodules ${D}${bindir}
+}
+
 do_install:append:class-target () {
 	# Tests are only installed on targets, not native builds.  Separating this out
 	# keeps glib-2.0-native from depending on DISTRO_FEATURES