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>

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index cb6aca702f17e046e5ec950e94c10525233b5d7e..a5db45524839b05ac820c002898096467349b2c3 100644 (file)
--- 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 () {