summaryrefslogtreecommitdiff
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-02-22 15:58:57 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 12:54:22 +0000
commita84ac3667d8b216164b80c88866325908c5ad98f (patch)
tree066397aaa48af42c6c4bba28623534fe5cc05883 /meta/recipes-core
parent05cc95e266d09e8af8e2bfab851d8ef8dc74fac3 (diff)
downloadopenembedded-core-a84ac3667d8b216164b80c88866325908c5ad98f.tar.gz
openembedded-core-a84ac3667d8b216164b80c88866325908c5ad98f.tar.bz2
openembedded-core-a84ac3667d8b216164b80c88866325908c5ad98f.zip
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@nathanrossi.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc10
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 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 () {