summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-11-27 11:17:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-11-30 08:43:04 +0000
commit1b6368ed099765c49dc5e8da01167f8430e7a566 (patch)
tree0bf86c37b16e0212a9cbb0547e6faf0a30fc3354 /meta/recipes-core/glib-2.0
parentc4f87eda9e8f64d6d34ccc6414bd9c542c18b865 (diff)
downloadpoky-1b6368ed099765c49dc5e8da01167f8430e7a566.tar.gz
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 <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc5
1 files changed, 5 insertions, 0 deletions
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 () {
113 mkdir -p ${D}${libdir}/gio/modules 113 mkdir -p ${D}${libdir}/gio/modules
114} 114}
115 115
116do_install:append:class-native () {
117 # Link gio-querymodules into ${bindir} as otherwise tools like meson won't find it
118 ln -rs ${D}${libexecdir}/gio-querymodules ${D}${bindir}
119}
120
116do_install:append:class-target () { 121do_install:append:class-target () {
117 # Tests are only installed on targets, not native builds. Separating this out 122 # Tests are only installed on targets, not native builds. Separating this out
118 # keeps glib-2.0-native from depending on DISTRO_FEATURES 123 # keeps glib-2.0-native from depending on DISTRO_FEATURES