summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-06 14:48:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-17 08:58:54 +0100
commit3103f04a3028bb5ca02b943e21ef2dbe2cf79e14 (patch)
tree014275c3ce246247d248884f1191837bd022337f /meta/recipes-core/glib-2.0
parentbb27ca7562982c4e6ff333c09a56e83f0daaeb3f (diff)
downloadpoky-3103f04a3028bb5ca02b943e21ef2dbe2cf79e14.tar.gz
ptest: Work from PTEST_ENABLED, not DISTRO_FEATURES
Some classes of recipe disable ptest even though its in DISTRO_FEATURES (e.g. nativesdk). We shouldn't attempt to build ptest packages when its disabled. This replaces some DISTRO_FEATURE checks with PTEST_ENABLED checks instead. (From OE-Core rev: d1369fe95ac6732e5747873eccd6a1e74359cea4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0')
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index cb07665d23..66bf290c2f 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -31,7 +31,7 @@ S = "${WORKDIR}/glib-${PV}"
31 31
32CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" 32CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man"
33 33
34PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}" 34PTEST_CONF = "${@bb.utils.contains('PTEST_ENABLED', '1', '--enable-installed-tests', '--disable-installed-tests', d)}"
35EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" 35EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}"
36EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" 36EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
37EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" 37EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu"