From 0cda9d8c8ddf67bad1a043c3486e1febcab646cf Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Wed, 23 Mar 2016 10:59:06 +0200 Subject: glib-2.0: Install gio-querymodules in main package gio-querymodules should be used whenever new Gio modules are installed (to regenerate the module cache) so it should be available by default. Each multilib is going to need its own variant (because the tool actually dlopens the modules when cache is generated), so it's packaged as ${libexecdir}/${MLPREFIX}gio-querymodules (From OE-Core rev: 832a499046e41be48fb035fa86df24589b94ada3) Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/glib-2.0/glib.inc') diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 35153fa2a7..75a7d250d8 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -48,8 +48,12 @@ do_configure_prepend() { sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in } -FILES_${PN} = "${libdir}/lib*${SOLIBS} ${libdir}/gio ${datadir}/glib-2.0/schemas \ - ${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in" +FILES_${PN} = "${libdir}/lib*${SOLIBS} \ + ${libdir}/gio \ + ${libexecdir}/*gio-querymodules \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/glib-2.0/gettext/mkinstalldirs \ + ${datadir}/glib-2.0/gettext/po/Makefile.in.in" FILES_${PN}-dev += "${libdir}/glib-2.0/include \ ${libdir}/gio/modules/lib*${SOLIBSDEV} \ ${libdir}/gio/modules/*.la" @@ -81,6 +85,11 @@ do_install_append () { rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test fi fi + + # Make sure gio-querymodules is unique among multilibs + if test "x${MLPREFIX}" != "x"; then + mv ${D}${libexecdir}/gio-querymodules ${D}${libexecdir}/${MLPREFIX}gio-querymodules + fi } do_install_append_libc-musl () { -- cgit v1.2.3-54-g00ecf