[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4849/8267] glib-2.0/glib.inc: Only apply MLPREFIX renaming to class-target

[Emmanuele Bassi <ebassi src gnome org>]

commit 4ffb728df4bdf21daef31d89cfa5771eaf0d90f8
Author: Nathan Rossi <nathan nathanrossi com>
Date:   Wed Feb 22 15:58:57 2017 +1000

    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-'.
    
    (From OE-Core rev: a84ac3667d8b216164b80c88866325908c5ad98f)
    
    Signed-off-by: Nathan Rossi <nathan nathanrossi com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/glib-2.0/glib.inc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index a5db455..bbac7eb 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 () {