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-2.0 | |
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-2.0')
3 files changed, 2 insertions, 105 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 @@ | |||
1 | Add 'ptest' target to Makefile, to run tests without checking dependencies. | ||
2 | Add 'install-ptest' target, to copy needed files to ptest dir. | ||
3 | |||
4 | Signed-off-by: Björn Stenberg <bjst@enea.com> | ||
5 | Upstream-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 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Pass CC & CFLAGS vars so that tune parameters get used. | ||
4 | This fixes compilation with x32 toolchain. | ||
5 | |||
6 | Received this patch from H.J. Lu <hjl.tools@gmail.com> | ||
7 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13 | ||
8 | |||
9 | Index: 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 | ||
26 | Index: 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 | ||
3 | make -k ptest | 3 | gnome-desktop-testing-runner glib |