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:54:32 +0100 |
| commit | 33bb8d5da050519043bb913bae4f5692bbd899ad (patch) | |
| tree | b5d4407483d21a03e1180e80bf92be0d96f939c9 /meta/recipes-core/glib-2.0/glib.inc | |
| parent | 4657b9a35e276b0891729d43f33db49ee5e3ae7d (diff) | |
| download | openembedded-core-33bb8d5da050519043bb913bae4f5692bbd899ad.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.
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}" CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" -PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-modular-tests', '--disable-modular-tests', d)}" +PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}" EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" -EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux --disable-modular-tests" +EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \ ${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 \ ${libdir}/gio/modules/lib*${SOLIBSDEV} \ ${libdir}/gio/modules/*.la" FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \ - ${libdir}/gio/modules/.debug" + ${libdir}/gio/modules/.debug \ + ${libdir}/glib-2.0/installed-tests/glib/.debug" FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ ${datadir}/bash-completion" +FILES_${PN}-ptest += "${libdir}/glib-2.0/installed-tests \ + ${datadir}/installed-tests/glib" ARM_INSTRUCTION_SET = "arm" USE_NLS = "yes" |