summaryrefslogtreecommitdiff
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-03-10 14:43:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-11 16:08:49 +0000
commit1944c9a1764105c15844c7dbf1d430389c02b631 (patch)
tree48ade9beb5f0def65ca4ceea3e2194bd4266140a /meta/recipes-core
parente5bf7d28dc72db652c6cfdaacba858bdc6c42e5e (diff)
downloadopenembedded-core-1944c9a1764105c15844c7dbf1d430389c02b631.tar.gz
openembedded-core-1944c9a1764105c15844c7dbf1d430389c02b631.tar.bz2
openembedded-core-1944c9a1764105c15844c7dbf1d430389c02b631.zip
glib-2.0: improve determinism for GIO ptests
Previously the GIO tests would be built or not depending on whether the host had a dbus-daemon binary available. Fix this by seeding the AC_CHECK_PROGS check with the right value, and adding a RDEPENDS for dbus-daemon on the target. Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 6600d33dcd..e8cdefdede 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -45,6 +45,9 @@ EXTRA_OECONF = "${PRINTF} ${CORECONF}"
EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu"
+# Tell configure that we'll have dbus-daemon on the target for the tests
+EXTRA_OECONF_class-target_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ac_cv_prog_DBUS_DAEMON=dbus-daemon', '', d)}"
+
do_configure_prepend() {
sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
}
@@ -113,6 +116,7 @@ do_install_append_class-target () {
}
RDEPENDS_${PN}-ptest += "\
+ dbus \
gnome-desktop-testing \
tzdata \
tzdata-americas \