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 | |
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>
-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 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb) | 5 |
2 files changed, 41 insertions, 2 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 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb index 1e3d36af1c..22fd34a6ff 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.44.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb | |||
@@ -15,9 +15,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ | |||
15 | file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ | 15 | file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \ |
16 | file://allow-run-media-sdX-drive-mount-if-username-root.patch \ | 16 | file://allow-run-media-sdX-drive-mount-if-username-root.patch \ |
17 | file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ | 17 | file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ |
18 | file://0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch \ | ||
18 | " | 19 | " |
19 | 20 | ||
20 | SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" | 21 | SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" |
21 | 22 | ||
22 | SRC_URI[md5sum] = "83efba4722a9674b97437d1d99af79db" | 23 | SRC_URI[md5sum] = "c90e93ceb45100ffc1d40ec5d2ca3248" |
23 | SRC_URI[sha256sum] = "8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07" | 24 | SRC_URI[sha256sum] = "5a1f03b952ebc3a7e9f612b8724f70898183e31503db329b4f15d07163c8fdfb" |