From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Date: Tue, 3 Apr 2018 15:45:24 +0000 (+0300)
Subject: glib-2.0/glib.inc: apply MLPREFIX renaming to all package classes
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~18210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0792540170b6150a0c5fe8586bb8012affc3f90e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

glib-2.0/glib.inc: apply MLPREFIX renaming to all package classes

Now that we have postinst intercept execution working for SDK generation,
adding MLPREFIX again makes sense in all cases, as the intercepts do require
that it is there.

This reverts commit 4ffb728df4bdf21daef31d89cfa5771eaf0d90f8.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 7e062eeb5da..b7c32e64bc8 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -104,6 +104,11 @@ do_install_append () {
 	if [ -e ${D}${libdir}/charset.alias ]; then
 		rm -f ${D}${libdir}/charset.alias
 	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 () {
@@ -114,11 +119,6 @@ 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
 }
 
 CODEGEN_PYTHON_RDEPENDS = "python3 python3-distutils python3-xml"