summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-04-22 15:33:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-22 17:13:54 +0100
commit535723da0048d27ebedf209627eff9a84b84d5df (patch)
tree3e3365eca854c8d3826e9d7b611971a8cb356e39 /meta
parente8720cc0bee5ca48b378c10720400d5bf734d1eb (diff)
downloadpoky-535723da0048d27ebedf209627eff9a84b84d5df.tar.gz
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) (From OE-Core rev: ab4309f4769724b7b778d04b6882172ae95311e9) 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.inc5
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}"
27 27
28CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap" 28CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap"
29 29
30PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '', '--disable-modular-tests', d)}" 30PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-modular-tests', '--disable-modular-tests', d)}"
31EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" 31EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}"
32EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" 32EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux --disable-modular-tests"
33EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no ${CORECONF}"
34 33
35FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \ 34FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \
36 ${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in" 35 ${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in"