summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-11-16 23:24:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-25 08:01:42 +0000
commit216d534258f4fd7aa3c46093aba6fa2967ae5283 (patch)
treeec9f0efb648bba743f580142f0b165e0364a8c76
parente6e9260b97d873f14991a1143f1bda5b1b624955 (diff)
downloadopenembedded-core-contrib-216d534258f4fd7aa3c46093aba6fa2967ae5283.tar.gz
openembedded-core-contrib-216d534258f4fd7aa3c46093aba6fa2967ae5283.tar.bz2
openembedded-core-contrib-216d534258f4fd7aa3c46093aba6fa2967ae5283.zip
glib-2.0: build dependency cleanup
New GLib doesn't require glib-2.0-native to build itself so remove it from the DEPENDS. However it is needed for the test suite so respect PTEST_ENABLED and add it to DEPENDS if required. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 072f790111..ae0eb79727 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -17,10 +17,10 @@ SECTION = "libs"
BBCLASSEXTEND = "native nativesdk"
-DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib"
-DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}"
+DEPENDS = "virtual/libiconv libffi zlib"
+DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' glib-2.0-native dbus', '', d)}"
DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native"
-DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib ${BPN}-native"
+DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib"
PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"