diff options
author | Ross Burton <ross.burton@intel.com> | 2014-07-23 23:07:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-25 15:33:59 +0100 |
commit | 35f3f10001675211e930adb312443f195257ce7a (patch) | |
tree | 6838fade6136078bf1d4df6ac296512cd4b14a5c | |
parent | 403aa976ed3dd8865336b3e37c96bf145c1e6995 (diff) | |
download | poky-35f3f10001675211e930adb312443f195257ce7a.tar.gz |
glib-2.0: use ptest-gnome
(From OE-Core rev: fb32cd7abac268747347ee5cff98a4d07dc4b780)
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.inc | 7 |
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" | |||
25 | LEAD_SONAME = "libglib-2.0.*" | 25 | LEAD_SONAME = "libglib-2.0.*" |
26 | FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext" | 26 | FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext" |
27 | 27 | ||
28 | inherit autotools gettext gtk-doc pkgconfig ptest | 28 | inherit autotools gettext gtk-doc pkgconfig ptest-gnome |
29 | 29 | ||
30 | S = "${WORKDIR}/glib-${PV}" | 30 | S = "${WORKDIR}/glib-${PV}" |
31 | 31 | ||
32 | CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" | 32 | CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" |
33 | 33 | ||
34 | PTEST_CONF = "${@bb.utils.contains('PTEST_ENABLED', '1', '--enable-installed-tests', '--disable-installed-tests', d)}" | 34 | EXTRA_OECONF = "--enable-included-printf=no ${CORECONF}" |
35 | EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" | ||
36 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" | 35 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" |
37 | EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" | 36 | EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" |
38 | 37 | ||
@@ -51,8 +50,6 @@ FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \ | |||
51 | FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" | 50 | FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" |
52 | FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ | 51 | FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ |
53 | ${datadir}/bash-completion" | 52 | ${datadir}/bash-completion" |
54 | FILES_${PN}-ptest += "${libexecdir}/installed-tests \ | ||
55 | ${datadir}/installed-tests/glib" | ||
56 | 53 | ||
57 | ARM_INSTRUCTION_SET = "arm" | 54 | ARM_INSTRUCTION_SET = "arm" |
58 | USE_NLS = "yes" | 55 | USE_NLS = "yes" |