summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch36
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch2
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.62.3.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.62.2.bb)4
3 files changed, 20 insertions, 22 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 ff2629f06c..48899ce852 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,4 +1,4 @@
1From 23cd157352ac8a53f992ddc6d6d01caadf1c79bc Mon Sep 17 00:00:00 2001 1From 0061d66057dfd7e7267772df60b36474fb180eed Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 9 Nov 2015 11:07:27 +0200 3Date: Mon, 9 Nov 2015 11:07:27 +0200
4Subject: [PATCH] Enable more tests while cross-compiling 4Subject: [PATCH] Enable more tests while cross-compiling
@@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [OE specific]
11Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 11Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
12 12
13--- 13---
14 gio/tests/meson.build | 26 ++++++++++++++------------ 14 gio/tests/meson.build | 24 ++++++++++++------------
15 1 file changed, 14 insertions(+), 12 deletions(-) 15 1 file changed, 12 insertions(+), 12 deletions(-)
16 16
17diff --git a/gio/tests/meson.build b/gio/tests/meson.build 17diff --git a/gio/tests/meson.build b/gio/tests/meson.build
18index 65f43e2..028b196 100644 18index 382dfcc..c171717 100644
19--- a/gio/tests/meson.build 19--- a/gio/tests/meson.build
20+++ b/gio/tests/meson.build 20+++ b/gio/tests/meson.build
21@@ -185,7 +185,7 @@ if host_machine.system() != 'windows' 21@@ -191,7 +191,7 @@ if host_machine.system() != 'windows'
22 22
23 # Test programs that need to bring up a session bus (requires dbus-daemon) 23 # Test programs that need to bring up a session bus (requires dbus-daemon)
24 have_dbus_daemon = find_program('dbus-daemon', required : false).found() 24 have_dbus_daemon = find_program('dbus-daemon', required : false).found()
@@ -27,12 +27,11 @@ index 65f43e2..028b196 100644
27 annotate_args = [ 27 annotate_args = [
28 '--annotate', 'org.project.Bar', 'Key1', 'Value1', 28 '--annotate', 'org.project.Bar', 'Key1', 'Value1',
29 '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', 29 '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2',
30@@ -453,12 +453,13 @@ if installed_tests_enabled 30@@ -465,12 +465,12 @@ if installed_tests_enabled
31 install_data('static-link.py', install_dir : installed_tests_execdir) 31 install_data('static-link.py', install_dir : installed_tests_execdir)
32 endif 32 endif
33 33
34-if not meson.is_cross_build() or meson.has_exe_wrapper() 34-if not meson.is_cross_build() or meson.has_exe_wrapper()
35+#if not meson.is_cross_build() or meson.has_exe_wrapper()
36+if meson.is_cross_build() 35+if meson.is_cross_build()
37 36
38 plugin_resources_c = custom_target('plugin-resources.c', 37 plugin_resources_c = custom_target('plugin-resources.c',
@@ -43,7 +42,7 @@ index 65f43e2..028b196 100644
43 '--target=@OUTPUT@', 42 '--target=@OUTPUT@',
44 '--sourcedir=' + meson.current_source_dir(), 43 '--sourcedir=' + meson.current_source_dir(),
45 '--generate-source', 44 '--generate-source',
46@@ -482,7 +483,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 45@@ -494,7 +494,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
47 test_gresource = custom_target('test.gresource', 46 test_gresource = custom_target('test.gresource',
48 input : 'test.gresource.xml', 47 input : 'test.gresource.xml',
49 output : 'test.gresource', 48 output : 'test.gresource',
@@ -52,7 +51,7 @@ index 65f43e2..028b196 100644
52 '--target=@OUTPUT@', 51 '--target=@OUTPUT@',
53 '--sourcedir=' + meson.current_source_dir(), 52 '--sourcedir=' + meson.current_source_dir(),
54 '--sourcedir=' + meson.current_build_dir(), 53 '--sourcedir=' + meson.current_build_dir(),
55@@ -493,7 +494,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 54@@ -505,7 +505,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
56 test_resources2_c = custom_target('test_resources2.c', 55 test_resources2_c = custom_target('test_resources2.c',
57 input : 'test3.gresource.xml', 56 input : 'test3.gresource.xml',
58 output : 'test_resources2.c', 57 output : 'test_resources2.c',
@@ -61,7 +60,7 @@ index 65f43e2..028b196 100644
61 '--target=@OUTPUT@', 60 '--target=@OUTPUT@',
62 '--sourcedir=' + meson.current_source_dir(), 61 '--sourcedir=' + meson.current_source_dir(),
63 '--generate', 62 '--generate',
64@@ -504,7 +505,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 63@@ -516,7 +516,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
65 test_resources2_h = custom_target('test_resources2.h', 64 test_resources2_h = custom_target('test_resources2.h',
66 input : 'test3.gresource.xml', 65 input : 'test3.gresource.xml',
67 output : 'test_resources2.h', 66 output : 'test_resources2.h',
@@ -70,7 +69,7 @@ index 65f43e2..028b196 100644
70 '--target=@OUTPUT@', 69 '--target=@OUTPUT@',
71 '--sourcedir=' + meson.current_source_dir(), 70 '--sourcedir=' + meson.current_source_dir(),
72 '--generate', 71 '--generate',
73@@ -516,7 +517,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 72@@ -528,7 +528,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
74 input : 'test2.gresource.xml', 73 input : 'test2.gresource.xml',
75 depends : big_test_resource, 74 depends : big_test_resource,
76 output : 'test_resources.c', 75 output : 'test_resources.c',
@@ -79,7 +78,7 @@ index 65f43e2..028b196 100644
79 '--target=@OUTPUT@', 78 '--target=@OUTPUT@',
80 '--sourcedir=' + meson.current_source_dir(), 79 '--sourcedir=' + meson.current_source_dir(),
81 '--sourcedir=' + meson.current_build_dir(), 80 '--sourcedir=' + meson.current_build_dir(),
82@@ -527,7 +528,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 81@@ -539,7 +539,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
83 digit_test_resources_c = custom_target('digit_test_resources.c', 82 digit_test_resources_c = custom_target('digit_test_resources.c',
84 input : '111_digit_test.gresource.xml', 83 input : '111_digit_test.gresource.xml',
85 output : 'digit_test_resources.c', 84 output : 'digit_test_resources.c',
@@ -88,7 +87,7 @@ index 65f43e2..028b196 100644
88 '--target=@OUTPUT@', 87 '--target=@OUTPUT@',
89 '--sourcedir=' + meson.current_source_dir(), 88 '--sourcedir=' + meson.current_source_dir(),
90 '--sourcedir=' + meson.current_build_dir(), 89 '--sourcedir=' + meson.current_build_dir(),
91@@ -538,7 +539,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 90@@ -550,7 +550,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
92 digit_test_resources_h = custom_target('digit_test_resources.h', 91 digit_test_resources_h = custom_target('digit_test_resources.h',
93 input : '111_digit_test.gresource.xml', 92 input : '111_digit_test.gresource.xml',
94 output : 'digit_test_resources.h', 93 output : 'digit_test_resources.h',
@@ -97,12 +96,11 @@ index 65f43e2..028b196 100644
97 '--target=@OUTPUT@', 96 '--target=@OUTPUT@',
98 '--sourcedir=' + meson.current_source_dir(), 97 '--sourcedir=' + meson.current_source_dir(),
99 '--generate', 98 '--generate',
100@@ -565,11 +566,12 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 99@@ -579,11 +579,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
101 # Support for --add-symbol was added to LLVM objcopy in 2019
102 # (https://reviews.llvm.org/D58234). FIXME: This test could be enabled for
103 # LLVM once that support is in a stable release. 100 # LLVM once that support is in a stable release.
104- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' 101 objcopy = find_program('objcopy', required : false)
105+ #if build_machine.system() == 'linux' and cc.get_id() == 'gcc' 102
103- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found()
106+ if not meson.is_cross_build() 104+ if not meson.is_cross_build()
107 test_gresource_binary = custom_target('test5.gresource', 105 test_gresource_binary = custom_target('test5.gresource',
108 input : 'test5.gresource.xml', 106 input : 'test5.gresource.xml',
@@ -112,7 +110,7 @@ index 65f43e2..028b196 100644
112 '--target=@OUTPUT@', 110 '--target=@OUTPUT@',
113 '--sourcedir=' + meson.current_source_dir(), 111 '--sourcedir=' + meson.current_source_dir(),
114 '--sourcedir=' + meson.current_build_dir(), 112 '--sourcedir=' + meson.current_build_dir(),
115@@ -581,7 +583,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 113@@ -595,7 +595,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
116 test_resources_binary_c = custom_target('test_resources_binary.c', 114 test_resources_binary_c = custom_target('test_resources_binary.c',
117 input : 'test5.gresource.xml', 115 input : 'test5.gresource.xml',
118 output : 'test_resources_binary.c', 116 output : 'test_resources_binary.c',
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
index 7e9925845b..70a43a7723 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
@@ -1,4 +1,4 @@
1From 6325bf4e8a2f569c55c8e1a36b9439d3566f98f6 Mon Sep 17 00:00:00 2001 1From dd8c6822d05d65e8db72cbff0b2f3c1088686b6f Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Fri, 11 Mar 2016 15:35:55 +0000 3Date: Fri, 11 Mar 2016 15:35:55 +0000
4Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds 4Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.62.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.62.3.bb
index 27a15a9b1d..25406ecfc8 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.62.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.62.3.bb
@@ -20,5 +20,5 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
20SRC_URI_append_class-native = " file://relocate-modules.patch" 20SRC_URI_append_class-native = " file://relocate-modules.patch"
21SRC_URI_append_class-target = " file://glib-meson.cross" 21SRC_URI_append_class-target = " file://glib-meson.cross"
22 22
23SRC_URI[md5sum] = "bed3a70397a019965efac0c49f9c8164" 23SRC_URI[md5sum] = "9766a37736974e636227d62f86bae40e"
24SRC_URI[sha256sum] = "698824a413f76df039739c2a78f45b10939d526ae7495bab4e694e6730deb3f1" 24SRC_URI[sha256sum] = "4400adc9f0d3ffcfe8e84225210370ce3f9853afb81812ddadb685325aa655c4"