summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Thomas <gary@mlbassoc.com>2017-01-21 06:02:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-05 09:20:21 +0000
commitef2b49408f82daaf9bb72b3b339b70a48b9a134b (patch)
tree3ffea347713cf735c5851e9a1eeecfb79f75a9b7
parent5ed1bc5b4dadc74f1db52179238fbbd145a59043 (diff)
downloadopenembedded-core-contrib-ef2b49408f82daaf9bb72b3b339b70a48b9a134b.tar.gz
openembedded-core-contrib-ef2b49408f82daaf9bb72b3b339b70a48b9a134b.tar.bz2
openembedded-core-contrib-ef2b49408f82daaf9bb72b3b339b70a48b9a134b.zip
glib-2.0: native package should not depend on DISTRO_FEATURES
xxx-native packages should not depend on ${DISTRO} settings. Doing so feels inherently wrong and limits the usefulness of sstate-cache. This patch changes how this package is installed, in particular removing the dependency on the ${DISTRO_FEATURES} variable in glib-2.0-native. This will further improve the ability to share native packages between builds with differences in ${DISTRO_FEATURES} Signed-off-by: Gary Thomas <gary@mlbassoc.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc14
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index cb6aca702f..a5db455248 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -92,16 +92,20 @@ do_install_append () {
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 () {
+ # Tests are only installed on targets, not native builds. Separating this out
+ # keeps glib-2.0-native from depending on ${DISTRO_FEATURES}
if [ -f ${D}${datadir}/installed-tests/glib/gdbus-serialization.test ]; then
if ${@bb.utils.contains("DISTRO_FEATURES", "x11", "false", "true", d)}; then
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 () {