From 1b6368ed099765c49dc5e8da01167f8430e7a566 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 27 Nov 2023 11:17:48 +0100 Subject: 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. (From OE-Core rev: cd530108e1b31ff3dff9e677e8e5af920e6609aa) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index cec06b2f88..fbf3a39b15 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 -- cgit v1.2.3-54-g00ecf