diff options
author | Ross Burton <ross.burton@intel.com> | 2015-11-16 23:24:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 08:08:11 +0000 |
commit | fcd7494b347423185c883b2897c4908929843a71 (patch) | |
tree | 4f041b21179cf6b3eae8ed8161c811ab32dfaacb /meta/recipes-core | |
parent | 5357764057e0ee4210d806c158db62367db826ae (diff) | |
download | poky-fcd7494b347423185c883b2897c4908929843a71.tar.gz |
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.
(From OE-Core rev: 216d534258f4fd7aa3c46093aba6fa2967ae5283)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 6 |
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" | |||
17 | 17 | ||
18 | BBCLASSEXTEND = "native nativesdk" | 18 | BBCLASSEXTEND = "native nativesdk" |
19 | 19 | ||
20 | DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib" | 20 | DEPENDS = "virtual/libiconv libffi zlib" |
21 | DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}" | 21 | DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' glib-2.0-native dbus', '', d)}" |
22 | DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" | 22 | DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" |
23 | DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib ${BPN}-native" | 23 | DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib" |
24 | 24 | ||
25 | PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen" | 25 | PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen" |
26 | 26 | ||