diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-04-22 15:33:25 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-22 15:48:57 +0100 |
| commit | 395b90054eccddc1c9062a9a8657ed4482b7710a (patch) | |
| tree | c15c634ca181ec6936e05a0087e6c13c4ba1f95f | |
| parent | 90ca53cbbdb1ed30883d4aa8ce9c933ae1fad5fa (diff) | |
| download | openembedded-core-395b90054eccddc1c9062a9a8657ed4482b7710a.tar.gz openembedded-core-395b90054eccddc1c9062a9a8657ed4482b7710a.tar.bz2 openembedded-core-395b90054eccddc1c9062a9a8657ed4482b7710a.zip | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | 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 cb391a27f5..42c34c3200 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" |