summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-01-22 16:03:31 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-26 22:49:39 +0000
commit9c84fbc97230990f8764ab62449724a67b624b24 (patch)
tree14db9a4d93c1fabdaf4efc2138d78d3fa19f20c5 /meta/recipes-core/glib-2.0/glib-2.0
parentbd7278cc3b4df09e86d073d6056c39ea50da863d (diff)
downloadpoky-9c84fbc97230990f8764ab62449724a67b624b24.tar.gz
glib-2.0: update to 2.46.2
Drop backported 0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch (From OE-Core rev: de83a71d416a51caf5b8b0db9c9102689b2cce8b) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.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.patch38
1 files changed, 0 insertions, 38 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
deleted file mode 100644
index 5f3fef0086..0000000000
--- 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
+++ /dev/null
@@ -1,38 +0,0 @@
1From 99dabcb02e2b3f90a12d17a9995752fcae57b522 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Thu, 5 Nov 2015 11:08:32 +0200
4Subject: [PATCH] gio/tests: Don't depend on a data file that's not built
5
6data.gresource is not built when cross-compiling: Don't
7add it to test_data in that case.
8
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10Upstream-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
15diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
16index 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--
372.6.2
38