[oe-commits] Ross Burton : glib-2.0: disable tests for native builds, and respect ptest for LSB
git at git.openembedded.org
git at git.openembedded.org
Wed May 22 16:08:52 UTC 2013
Module: openembedded-core.git
Branch: dylan
Commit: ab4309f4769724b7b778d04b6882172ae95311e9
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ab4309f4769724b7b778d04b6882172ae95311e9
Author: Ross Burton <ross.burton at intel.com>
Date: Mon Apr 22 15:33:25 2013 +0100
glib-2.0: disable tests for native builds, and respect ptest for LSB
Without disabling the tests in the native build, glib-2.0-native will need
libdbus-native to be present. As we don't run the tests, disable them so we
don't have build failures due to missing dependencies.
Also, the LSB override was missing PTEST_CONF so the same problem could happen.
After adding PTEST_CONF the LSB override is identical to the non-overridden
EXTRA_OECONF, so remove it.
Finally, to be explicit, put --enable-module-tests in PTEST_CONF.
(From OE-Core master rev: 395b90054eccddc1c9062a9a8657ed4482b7710a)
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/glib-2.0/glib.inc | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index cb391a2..42c34c3 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -27,10 +27,9 @@ S = "${WORKDIR}/glib-${PV}"
CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap"
-PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '', '--disable-modular-tests', d)}"
+PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-modular-tests', '--disable-modular-tests', d)}"
EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}"
-EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
-EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no ${CORECONF}"
+EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux --disable-modular-tests"
FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \
${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
More information about the Openembedded-commits
mailing list