From a84ac3667d8b216164b80c88866325908c5ad98f Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 22 Feb 2017 15:58:57 +1000 Subject: glib-2.0/glib.inc: Only apply MLPREFIX renaming to class-target When renaming the 'gio-querymodules' binary to prefix with the current MLPREFIX, only do this for target packages where the MLPREFIX makes sense. This skips renaming for nativesdk targets which have MLPREFIX set to 'nativesdk-'. Signed-off-by: Nathan Rossi Signed-off-by: Ross Burton --- meta/recipes-core/glib-2.0/glib.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 a5db455248..bbac7ebd32 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -91,11 +91,6 @@ do_install_append () { if [ -f ${D}${bindir}/glib-mkenums ]; then sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums 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_class-target () { @@ -106,6 +101,11 @@ do_install_append_class-target () { 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 1.2.3-korg