diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-09-06 12:29:29 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-10 12:13:06 +0100 |
commit | b4696f512443412ac79b1cc7816aa1ccf809996e (patch) | |
tree | 9afc6ff890795e523047d4f85bbf990b44db5669 /meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch | |
parent | b0c7ed82694b7bad9d14bab9692f54a44b863583 (diff) | |
download | poky-b4696f512443412ac79b1cc7816aa1ccf809996e.tar.gz |
glib: update to 2.58.0
Drop upstreamed patches, refresh the rest.
Add an explicit dependency on gettext-native, as glib is no longer
fooled by setting msgfmt to /bin/false.
(From OE-Core rev: 79d229e8be892cc0bd36fe9f71ac4671cc34aa82)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch index b98f933dae..50781e7892 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d762907d33b81cf7469b5696c87f2188d2050afb Mon Sep 17 00:00:00 2001 | 1 | From 4b1a6d247c78125096a6ea5ab3cab8a1f000dc23 Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Mon, 9 Nov 2015 11:07:27 +0200 | 3 | Date: Mon, 9 Nov 2015 11:07:27 +0200 |
4 | Subject: [PATCH 06/10] Enable more tests while cross-compiling | 4 | Subject: [PATCH] Enable more tests while cross-compiling |
5 | 5 | ||
6 | Upstream disables a few tests while cross-compiling because their build requires | 6 | Upstream disables a few tests while cross-compiling because their build requires |
7 | running other built binaries. This usually makes sense but in the cross-compile | 7 | running other built binaries. This usually makes sense but in the cross-compile |
@@ -16,10 +16,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
16 | 2 files changed, 11 insertions(+), 7 deletions(-) | 16 | 2 files changed, 11 insertions(+), 7 deletions(-) |
17 | 17 | ||
18 | diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am | 18 | diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
19 | index acc1da4..9176640 100644 | 19 | index 1f0bed7..8295deb 100644 |
20 | --- a/gio/tests/Makefile.am | 20 | --- a/gio/tests/Makefile.am |
21 | +++ b/gio/tests/Makefile.am | 21 | +++ b/gio/tests/Makefile.am |
22 | @@ -516,10 +516,9 @@ test_programs += \ | 22 | @@ -550,10 +550,9 @@ test_programs += \ |
23 | endif | 23 | endif |
24 | 24 | ||
25 | # ----------------------------------------------------------------------------- | 25 | # ----------------------------------------------------------------------------- |
@@ -32,7 +32,7 @@ index acc1da4..9176640 100644 | |||
32 | test_programs += resources | 32 | test_programs += resources |
33 | resources_SOURCES = resources.c | 33 | resources_SOURCES = resources.c |
34 | nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h | 34 | nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h |
35 | @@ -543,7 +542,11 @@ if !ENABLE_INSTALLED_TESTS | 35 | @@ -578,7 +577,11 @@ if !ENABLE_INSTALLED_TESTS |
36 | libresourceplugin_la_LDFLAGS += -rpath / | 36 | libresourceplugin_la_LDFLAGS += -rpath / |
37 | endif | 37 | endif |
38 | 38 | ||
@@ -44,7 +44,7 @@ index acc1da4..9176640 100644 | |||
44 | 44 | ||
45 | test-generated.txt: test1.txt | 45 | test-generated.txt: test1.txt |
46 | $(AM_V_GEN) echo "Generated" > $@ && \ | 46 | $(AM_V_GEN) echo "Generated" > $@ && \ |
47 | @@ -564,7 +567,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- | 47 | @@ -599,7 +602,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- |
48 | 48 | ||
49 | EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml | 49 | EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml |
50 | CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource | 50 | CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource |
@@ -53,10 +53,10 @@ index acc1da4..9176640 100644 | |||
53 | BUILT_SOURCES += giotypefuncs.inc | 53 | BUILT_SOURCES += giotypefuncs.inc |
54 | 54 | ||
55 | diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am | 55 | diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am |
56 | index 656941d..68555ff 100644 | 56 | index 0e60987..927d13a 100644 |
57 | --- a/tests/gobject/Makefile.am | 57 | --- a/tests/gobject/Makefile.am |
58 | +++ b/tests/gobject/Makefile.am | 58 | +++ b/tests/gobject/Makefile.am |
59 | @@ -48,10 +48,13 @@ if ENABLE_TIMELOOP | 59 | @@ -51,10 +51,13 @@ if ENABLE_TIMELOOP |
60 | installed_test_programs += timeloop-closure | 60 | installed_test_programs += timeloop-closure |
61 | endif | 61 | endif |
62 | 62 | ||
@@ -72,14 +72,9 @@ index 656941d..68555ff 100644 | |||
72 | 72 | ||
73 | testmarshal.h: stamp-testmarshal.h | 73 | testmarshal.h: stamp-testmarshal.h |
74 | @true | 74 | @true |
75 | @@ -69,7 +72,6 @@ BUILT_SOURCES += testmarshal.h testmarshal.c | 75 | @@ -71,4 +74,3 @@ testmarshal.c: testmarshal.h testmarshal.list $(glib_genmarshal) |
76 | CLEANFILES += stamp-testmarshal.h | 76 | BUILT_SOURCES += testmarshal.h testmarshal.c |
77 | CLEANFILES += stamp-testmarshal.h testmarshal.h testmarshal.c | ||
77 | EXTRA_DIST += testcommon.h testmarshal.list | 78 | EXTRA_DIST += testcommon.h testmarshal.list |
78 | BUILT_EXTRA_DIST += testmarshal.h testmarshal.c | ||
79 | -endif # !CROSS_COMPILING | 79 | -endif # !CROSS_COMPILING |
80 | 80 | \ No newline at end of file | |
81 | dist-hook: $(BUILT_EXTRA_DIST) | ||
82 | files='$(BUILT_EXTRA_DIST)'; \ | ||
83 | -- | ||
84 | 2.14.1 | ||
85 | |||