summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-01-17 11:09:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-19 16:32:11 +0000
commit6e15d32e83ed202f1210589f55da7fb0ee0587af (patch)
treeb96e2780cb62156aaa09afc7c1f9b4bef5045173 /meta
parentc97d01d5b52aaa76594e38e97042e302df3f4f21 (diff)
downloadpoky-6e15d32e83ed202f1210589f55da7fb0ee0587af.tar.gz
glib-2.0: add explicit build dependency on DBus when ptest is enabled
If the tests are enabled then configure will check for the presence DBus. It's generally present through the runtime dependencies so this often succeeds but as it isn't a build dependency it's possible for DBus to be present at configure time but removed at compile time, resulting in build failures. (From OE-Core rev: 0150e86a7609579cf26f5ef5c6c69b521340218e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 7b471e7fa9..33d30c110f 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -16,8 +16,10 @@ SECTION = "libs"
16BBCLASSEXTEND = "native nativesdk" 16BBCLASSEXTEND = "native nativesdk"
17 17
18DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib" 18DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib"
19DEPENDS_append_class-target = "${@base_contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}"
19DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native" 20DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native"
20DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-libffi nativesdk-zlib ${BPN}-native" 21DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-libffi nativesdk-zlib ${BPN}-native"
22
21PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen" 23PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
22 24
23LEAD_SONAME = "libglib-2.0.*" 25LEAD_SONAME = "libglib-2.0.*"