diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-11-05 11:31:39 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 08:08:11 +0000 |
commit | 1e271af2b18fb3c1f9f472f453b3a1716b081284 (patch) | |
tree | 943cfcfcd1b65405e2aa32aeb88fa42942e9e7c3 /meta/recipes-core/glib-2.0/glib-2.0 | |
parent | bc1be0766ce840f7d3ee5501fa52d8030aaa04c5 (diff) | |
download | poky-1e271af2b18fb3c1f9f472f453b3a1716b081284.tar.gz |
glib-2.0: Upgrade 2.44.1 -> 2.46.1
Fix cross-compilation build issue in gio tests.
(From OE-Core rev: 17bbd1957720d6faea04530211a76655541fe71e)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch new file mode 100644 index 0000000000..5f3fef0086 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 99dabcb02e2b3f90a12d17a9995752fcae57b522 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Thu, 5 Nov 2015 11:08:32 +0200 | ||
4 | Subject: [PATCH] gio/tests: Don't depend on a data file that's not built | ||
5 | |||
6 | data.gresource is not built when cross-compiling: Don't | ||
7 | add it to test_data in that case. | ||
8 | |||
9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
10 | Upstream-Status: Backport [https://bugzilla.gnome.org/show_bug.cgi?id=757628] | ||
11 | --- | ||
12 | gio/tests/Makefile.am | 3 ++- | ||
13 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am | ||
16 | index 894cf43..cc7deb3 100644 | ||
17 | --- a/gio/tests/Makefile.am | ||
18 | +++ b/gio/tests/Makefile.am | ||
19 | @@ -76,7 +76,6 @@ dist_test_data = \ | ||
20 | $(NULL) | ||
21 | |||
22 | test_data = \ | ||
23 | - test.gresource \ | ||
24 | $(NULL) | ||
25 | |||
26 | uninstalled_test_extra_programs = \ | ||
27 | @@ -520,6 +519,8 @@ libresourceplugin_la_SOURCES = resourceplugin.c plugin_resources.c | ||
28 | libresourceplugin_la_LDFLAGS = -avoid-version -module -export-dynamic $(no_undefined) | ||
29 | libresourceplugin_la_LIBADD = $(LDADD) | ||
30 | |||
31 | +test_data += test.gresource | ||
32 | + | ||
33 | # libtool contains a bug whereby the created .la file doesn't contain the correct dlname='' in the case that | ||
34 | # you're building a library but not installing it. This is apparently because the only considered use for an | ||
35 | # uninstalled library is as a convenience library for linking (despite the fact that we give -module). The lack | ||
36 | -- | ||
37 | 2.6.2 | ||
38 | |||