summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-10-07 17:49:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 16:55:28 +0100
commit7241b288b7a5772f6364bb7a5a9bdeeb7cebb5bc (patch)
tree141dea363c4ebfb667603b5f2390b51438d341c9
parentd0b578de845f8ac4b5943d874433700b0509900f (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch61
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch42
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/run-ptest4
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb)9
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc9
5 files changed, 12 insertions, 113 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch b/meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch
deleted file mode 100644
index 40c5b9fdb1..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch
+++ /dev/null
@@ -1,61 +0,0 @@
1Add 'ptest' target to Makefile, to run tests without checking dependencies.
2Add 'install-ptest' target, to copy needed files to ptest dir.
3
4Signed-off-by: Björn Stenberg <bjst@enea.com>
5Upstream-Status: Pending
6---
7 Makefile.decl | 43 +++++++++++++++++++++++++++++++++++++++++++
8 1 file changed, 43 insertions(+)
9
10--- a/Makefile.decl 2012-03-12 01:42:39.000000000 +0100
11+++ b/Makefile.decl 2012-11-26 13:42:08.436865192 +0100
12@@ -25,6 +25,49 @@
13 test-nonrecursive:
14 endif
15
16+ptest: ptest-nonrecursive
17+ @ for subdir in $(SUBDIRS) .; do \
18+ test -d "$$subdir" -a "$$subdir" != "." -a "$$subdir" != "po" && \
19+ ( test -d $$subdir && cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) \
20+ done
21+
22+ptest-nonrecursive:
23+ @test -z "${TEST_PROGS}" || ${GTESTER} --keep-going --verbose ${TEST_PROGS}
24+
25+install-ptest: install-ptest-nonrecursive
26+ @test -z "$(SUBDIRS)" || for subdir in $(SUBDIRS); do \
27+ test "$$subdir" == "." || \
28+ (cd $$subdir && $(MAKE) DESTDIR=$(DESTDIR)/$$subdir $@ ) \
29+ done
30+
31+# install files used for ptest:
32+# - copy EXTRA_DIST (for test data in glib/tests)
33+# - run dist-hook (for glib/tests/bookmarks/ and glib/tests/markups)
34+# - copy TEST_PROGS (the test programs)
35+# - copy INSTALL_PROGS (for glib/gtester)
36+# - avoid libtool wrappers by copying binaries from .libs
37+# - strip Makefile: target from all Makefiles
38+install-ptest-nonrecursive:
39+ @mkdir -p $(DESTDIR)
40+ @if [ -n "${TEST_PROGS}" ]; then \
41+ if [ -n "${EXTRA_DIST}" ]; then \
42+ cp ${EXTRA_DIST} $(DESTDIR); \
43+ fi; \
44+ grep -q dist-hook: Makefile && \
45+ $(MAKE) distdir=$(DESTDIR) dist-hook; \
46+ if [ -d .libs ] ; then \
47+ cd .libs; \
48+ fi; \
49+ cp ${TEST_PROGS} $(DESTDIR); \
50+ fi;
51+ @if [ -n "${INSTALL_PROGS}" ]; then \
52+ if [ -d .libs ] ; then \
53+ cd .libs; \
54+ fi; \
55+ cp ${INSTALL_PROGS} $(DESTDIR); \
56+ fi
57+ @test -f Makefile && sed 's/^Makefile:/_Makefile:/' <Makefile >$(DESTDIR)/Makefile
58+
59 # test-report: run tests in subdirs and generate report
60 # perf-report: run tests in subdirs with -m perf and generate report
61 # full-report: like test-report: with -m perf and -m slow
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
deleted file mode 100644
index 0c243cddae..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1Upstream-Status: Pending
2
3Pass CC & CFLAGS vars so that tune parameters get used.
4This fixes compilation with x32 toolchain.
5
6Received this patch from H.J. Lu <hjl.tools@gmail.com>
7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
8
9Index: glib-2.30.0/glib/Makefile.am
10===================================================================
11--- glib-2.30.0.orig/glib/Makefile.am
12+++ glib-2.30.0/glib/Makefile.am
13@@ -359,10 +359,10 @@ INSTALL_PROGS=
14
15 if ENABLE_DTRACE
16 glib_probes.h: glib_probes.d Makefile
17- $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
18+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp
19 @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
20 glib_probes.o: glib_probes.d Makefile
21- $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
22+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
23 BUILT_SOURCES += glib_probes.h glib_probes.o
24 CLEANFILES += glib_probes.h glib_probes.h.tmp
25 libglib_2_0_la_LIBADD += glib_probes.o
26Index: glib-2.30.0/gobject/Makefile.am
27===================================================================
28--- glib-2.30.0.orig/gobject/Makefile.am
29+++ glib-2.30.0/gobject/Makefile.am
30@@ -141,10 +141,10 @@ gobject_c_sources = \
31
32 if ENABLE_DTRACE
33 gobject_probes.h: gobject_probes.d Makefile
34- $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
35+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp
36 @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
37 gobject_probes.o: gobject_probes.d Makefile
38- $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
39+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
40 BUILT_SOURCES += gobject_probes.h gobject_probes.o
41 CLEANFILES += gobject_probes.h
42 libgobject_2_0_la_LIBADD += gobject_probes.o
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
index 3deb586999..130ae09b6c 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
+++ b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
@@ -1,3 +1,3 @@
1#!/bin/sh 1#! /bin/sh
2 2
3make -k ptest 3gnome-desktop-testing-runner glib
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb
index d62c1fd36e..4b9b1129e2 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb
@@ -10,22 +10,21 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
10 10
11SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ 11SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
12 file://configure-libtool.patch \ 12 file://configure-libtool.patch \
13 file://glib-2.0_fix_for_x32.patch \
14 file://fix-conflicting-rand.patch \ 13 file://fix-conflicting-rand.patch \
15 file://Makefile-ptest.patch \
16 file://add-march-i486-into-CFLAGS-automatically.patch \ 14 file://add-march-i486-into-CFLAGS-automatically.patch \
17 file://run-ptest \
18 file://glib-2.0-configure-readlink.patch \ 15 file://glib-2.0-configure-readlink.patch \
16 file://run-ptest \
19 " 17 "
20 18
21SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" 19SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
22 20
23SRC_URI[md5sum] = "2f4b15f7ef43d8702d067ab987bf7aba" 21SRC_URI[md5sum] = "c50d2805a76763e9b4cc4385d4ea215d"
24SRC_URI[sha256sum] = "f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e" 22SRC_URI[sha256sum] = "7513a7de5e814ccb48206340a8773ea523d6a7bf04dc74565de69b899bc2ff32"
25 23
26BBCLASSEXTEND = "native nativesdk" 24BBCLASSEXTEND = "native nativesdk"
27 25
28RDEPENDS_${PN}-ptest += "\ 26RDEPENDS_${PN}-ptest += "\
27 gnome-desktop-testing \
29 tzdata \ 28 tzdata \
30 tzdata-americas \ 29 tzdata-americas \
31 tzdata-asia \ 30 tzdata-asia \
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
28CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" 28CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man"
29 29
30PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-modular-tests', '--disable-modular-tests', d)}" 30PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}"
31EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" 31EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}"
32EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux --disable-modular-tests" 32EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
33 33
34FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \ 34FILES_${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"
39FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \ 39FILES_${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"
41FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" 42FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py"
42FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ 43FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \
43 ${datadir}/bash-completion" 44 ${datadir}/bash-completion"
45FILES_${PN}-ptest += "${libdir}/glib-2.0/installed-tests \
46 ${datadir}/installed-tests/glib"
44 47
45ARM_INSTRUCTION_SET = "arm" 48ARM_INSTRUCTION_SET = "arm"
46USE_NLS = "yes" 49USE_NLS = "yes"