diff mbox series

[16/19] glib-2.0: install gio-querymodules into bindir as well as libexecdir for native

Message ID 20231127101751.3187950-16-alex@linutronix.de
State Accepted, archived
Commit cd530108e1b31ff3dff9e677e8e5af920e6609aa
Headers show
Series [01/19] sstate.bbclass: setscene_depvalid(): do not exclude shadow-native from task dependency resolution | expand

Commit Message

Alexander Kanavin Nov. 27, 2023, 10:17 a.m. UTC
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>
---
 meta/recipes-core/glib-2.0/glib.inc | 5 +++++
 1 file changed, 5 insertions(+)
diff mbox series

Patch

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