diff options
author | Ross Burton <ross.burton@intel.com> | 2013-10-07 17:49:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-14 16:55:28 +0100 |
commit | 7241b288b7a5772f6364bb7a5a9bdeeb7cebb5bc (patch) | |
tree | 141dea363c4ebfb667603b5f2390b51438d341c9 /meta/recipes-core/glib-2.0/glib.inc | |
parent | d0b578de845f8ac4b5943d874433700b0509900f (diff) | |
download | poky-7241b288b7a5772f6364bb7a5a9bdeeb7cebb5bc.tar.gz |
glib-2.0: upgrade to 2.28.0
Drop the ptest patches and instead use --enable-installed-tests, updating
run-ptest to invoke gnome-desktop-testing-runner.
Drop the x32 build patch, upstream has integrated a similar fix.
(From OE-Core rev: 33bb8d5da050519043bb913bae4f5692bbd899ad)
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>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib.inc')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index e57d2ac934..ad0671a770 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -27,9 +27,9 @@ S = "${WORKDIR}/glib-${PV}" | |||
27 | 27 | ||
28 | CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" | 28 | CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" |
29 | 29 | ||
30 | PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-modular-tests', '--disable-modular-tests', d)}" | 30 | PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}" |
31 | EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" | 31 | EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" |
32 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux --disable-modular-tests" | 32 | EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" |
33 | 33 | ||
34 | FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \ | 34 | FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \ |
35 | ${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" |
@@ -37,10 +37,13 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include \ | |||
37 | ${libdir}/gio/modules/lib*${SOLIBSDEV} \ | 37 | ${libdir}/gio/modules/lib*${SOLIBSDEV} \ |
38 | ${libdir}/gio/modules/*.la" | 38 | ${libdir}/gio/modules/*.la" |
39 | FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \ | 39 | FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \ |
40 | ${libdir}/gio/modules/.debug" | 40 | ${libdir}/gio/modules/.debug \ |
41 | ${libdir}/glib-2.0/installed-tests/glib/.debug" | ||
41 | FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" | 42 | FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" |
42 | FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ | 43 | FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ |
43 | ${datadir}/bash-completion" | 44 | ${datadir}/bash-completion" |
45 | FILES_${PN}-ptest += "${libdir}/glib-2.0/installed-tests \ | ||
46 | ${datadir}/installed-tests/glib" | ||
44 | 47 | ||
45 | ARM_INSTRUCTION_SET = "arm" | 48 | ARM_INSTRUCTION_SET = "arm" |
46 | USE_NLS = "yes" | 49 | USE_NLS = "yes" |