[oe-commits] [openembedded-core] 58/91: glib-2.0/glib.inc: Only apply MLPREFIX renaming to class-target

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit a84ac3667d8b216164b80c88866325908c5ad98f
Author: Nathan Rossi <nathan at nathanrossi.com>
AuthorDate: 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-'.
    
    Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-core/glib-2.0/glib.inc | 10 +++++-----
 1 file 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 () {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.