summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-07-23 23:07:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-25 15:33:33 +0100
commitfb32cd7abac268747347ee5cff98a4d07dc4b780 (patch)
tree937274541729e310f1fc62bfb4c06b122a6582df
parent6a66fadbd7d7675c61c342f9c338edbdedf8b92c (diff)
downloadopenembedded-core-fb32cd7abac268747347ee5cff98a4d07dc4b780.tar.gz
openembedded-core-fb32cd7abac268747347ee5cff98a4d07dc4b780.tar.bz2
openembedded-core-fb32cd7abac268747347ee5cff98a4d07dc4b780.zip
glib-2.0: use ptest-gnome
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc7
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 2eda8a1ddc..ce908cf0f2 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -25,14 +25,13 @@ PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
LEAD_SONAME = "libglib-2.0.*"
FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext"
-inherit autotools gettext gtk-doc pkgconfig ptest
+inherit autotools gettext gtk-doc pkgconfig ptest-gnome
S = "${WORKDIR}/glib-${PV}"
CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man"
-PTEST_CONF = "${@bb.utils.contains('PTEST_ENABLED', '1', '--enable-installed-tests', '--disable-installed-tests', d)}"
-EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}"
+EXTRA_OECONF = "--enable-included-printf=no ${CORECONF}"
EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu"
@@ -51,8 +50,6 @@ FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \
FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py"
FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \
${datadir}/bash-completion"
-FILES_${PN}-ptest += "${libexecdir}/installed-tests \
- ${datadir}/installed-tests/glib"
ARM_INSTRUCTION_SET = "arm"
USE_NLS = "yes"