From d4caf50fc2d7eb63eb5fe96ae9edf0e66e924b4d Mon Sep 17 00:00:00 2001 From: Gary Thomas Date: Sat, 21 Jan 2017 06:02:18 +0100 Subject: 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} (From OE-Core rev: ef2b49408f82daaf9bb72b3b339b70a48b9a134b) Signed-off-by: Gary Thomas Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib.inc | 14 +++++++++----- 1 file 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 () { -- cgit 1.2.3-korg