summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
diff options
context:
space:
mode:
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.patch121
1 files changed, 0 insertions, 121 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
deleted file mode 100644
index 41ecfa1df8..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch
+++ /dev/null
@@ -1,121 +0,0 @@
1From 7cde170afe6854d674b50e32b4c1d3b511be9abe Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 9 Nov 2015 11:07:27 +0200
4Subject: [PATCH] Enable more tests while cross-compiling
5
6Upstream disables a few tests while cross-compiling because their build requires
7running other built binaries. This usually makes sense but in the cross-compile
8case we can depend on glib-2.0-native.
9
10Upstream-Status: Inappropriate [OE specific]
11Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
12
13---
14 gio/tests/meson.build | 24 ++++++++++++------------
15 1 file changed, 12 insertions(+), 12 deletions(-)
16
17diff --git a/gio/tests/meson.build b/gio/tests/meson.build
18index 788cf97..dab65d2 100644
19--- a/gio/tests/meson.build
20+++ b/gio/tests/meson.build
21@@ -203,7 +203,7 @@ if host_machine.system() != 'windows'
22
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()
25- if have_dbus_daemon
26+ if true
27 annotate_args = [
28 '--annotate', 'org.project.Bar', 'Key1', 'Value1',
29 '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2',
30@@ -548,12 +548,12 @@ if installed_tests_enabled
31 endforeach
32 endif
33
34-if not meson.is_cross_build() or meson.has_exe_wrapper()
35+if meson.is_cross_build()
36
37 plugin_resources_c = custom_target('plugin-resources.c',
38 input : 'test4.gresource.xml',
39 output : 'plugin-resources.c',
40- command : [glib_compile_resources,
41+ command : ['glib-compile-resources',
42 '--target=@OUTPUT@',
43 '--sourcedir=' + meson.current_source_dir(),
44 '--generate-source',
45@@ -577,7 +577,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
46 test_gresource = custom_target('test.gresource',
47 input : 'test.gresource.xml',
48 output : 'test.gresource',
49- command : [glib_compile_resources,
50+ command : ['glib-compile-resources',
51 '--target=@OUTPUT@',
52 '--sourcedir=' + meson.current_source_dir(),
53 '--sourcedir=' + meson.current_build_dir(),
54@@ -588,7 +588,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
55 test_resources2_c = custom_target('test_resources2.c',
56 input : 'test3.gresource.xml',
57 output : 'test_resources2.c',
58- command : [glib_compile_resources,
59+ command : ['glib-compile-resources',
60 '--target=@OUTPUT@',
61 '--sourcedir=' + meson.current_source_dir(),
62 '--generate',
63@@ -599,7 +599,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
64 test_resources2_h = custom_target('test_resources2.h',
65 input : 'test3.gresource.xml',
66 output : 'test_resources2.h',
67- command : [glib_compile_resources,
68+ command : ['glib-compile-resources',
69 '--target=@OUTPUT@',
70 '--sourcedir=' + meson.current_source_dir(),
71 '--generate',
72@@ -611,7 +611,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
73 input : 'test2.gresource.xml',
74 depends : big_test_resource,
75 output : 'test_resources.c',
76- command : [glib_compile_resources,
77+ command : ['glib-compile-resources',
78 '--target=@OUTPUT@',
79 '--sourcedir=' + meson.current_source_dir(),
80 '--sourcedir=' + meson.current_build_dir(),
81@@ -622,7 +622,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
82 digit_test_resources_c = custom_target('digit_test_resources.c',
83 input : '111_digit_test.gresource.xml',
84 output : 'digit_test_resources.c',
85- command : [glib_compile_resources,
86+ command : ['glib-compile-resources',
87 '--target=@OUTPUT@',
88 '--sourcedir=' + meson.current_source_dir(),
89 '--sourcedir=' + meson.current_build_dir(),
90@@ -633,7 +633,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
91 digit_test_resources_h = custom_target('digit_test_resources.h',
92 input : '111_digit_test.gresource.xml',
93 output : 'digit_test_resources.h',
94- command : [glib_compile_resources,
95+ command : ['glib-compile-resources',
96 '--target=@OUTPUT@',
97 '--sourcedir=' + meson.current_source_dir(),
98 '--generate',
99@@ -668,11 +668,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
100
101 ld = find_program('ld', required : false)
102
103- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
104+ if not meson.is_cross_build()
105 test_gresource_binary = custom_target('test5.gresource',
106 input : 'test5.gresource.xml',
107 output : 'test5.gresource',
108- command : [glib_compile_resources,
109+ command : ['glib-compile-resources',
110 '--target=@OUTPUT@',
111 '--sourcedir=' + meson.current_source_dir(),
112 '--sourcedir=' + meson.current_build_dir(),
113@@ -684,7 +684,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
114 test_resources_binary_c = custom_target('test_resources_binary.c',
115 input : 'test5.gresource.xml',
116 output : 'test_resources_binary.c',
117- command : [glib_compile_resources,
118+ command : ['glib-compile-resources',
119 '--target=@OUTPUT@',
120 '--sourcedir=' + meson.current_source_dir(),
121 '--sourcedir=' + meson.current_build_dir(),
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-12 04:06:27 +0000