summaryrefslogtreecommitdiffstats
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 23:27:09 +0000
commit4ffb728df4bdf21daef31d89cfa5771eaf0d90f8 (patch)
tree94576caaac80a867fdddcbafa3d4ddcb4042f17c
parent4e4ef3a683eabfcbc413a862131f0ddcf9f7acab (diff)
downloadpoky-4ffb728df4bdf21daef31d89cfa5771eaf0d90f8.tar.gz
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>
-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 () {
91 if [ -f ${D}${bindir}/glib-mkenums ]; then 91 if [ -f ${D}${bindir}/glib-mkenums ]; then
92 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums 92 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums
93 fi 93 fi
94
95 # Make sure gio-querymodules is unique among multilibs
96 if test "x${MLPREFIX}" != "x"; then
97 mv ${D}${libexecdir}/gio-querymodules ${D}${libexecdir}/${MLPREFIX}gio-querymodules
98 fi
99} 94}
100 95
101do_install_append_class-target () { 96do_install_append_class-target () {
@@ -106,6 +101,11 @@ do_install_append_class-target () {
106 rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test 101 rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
107 fi 102 fi
108 fi 103 fi
104
105 # Make sure gio-querymodules is unique among multilibs
106 if test "x${MLPREFIX}" != "x"; then
107 mv ${D}${libexecdir}/gio-querymodules ${D}${libexecdir}/${MLPREFIX}gio-querymodules
108 fi
109} 109}
110 110
111do_install_append_libc-musl () { 111do_install_append_libc-musl () {