diff options
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.patch | 48 |
1 files changed, 26 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 9bbb33ffc1..6147bdae46 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 @@ | |||
1 | From 73b1c416674d285b021e218da1a3ddb884e606da Mon Sep 17 00:00:00 2001 | 1 | From d2d7af496b4f4a13779179dbcbb98de56b09783f Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Mon, 9 Nov 2015 11:07:27 +0200 | 3 | Date: Mon, 9 Nov 2015 11:07:27 +0200 |
4 | Subject: [PATCH] Enable more tests while cross-compiling | 4 | Subject: [PATCH] Enable more tests while cross-compiling |
@@ -9,16 +9,15 @@ case we can depend on glib-2.0-native. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [OE specific] | 10 | Upstream-Status: Inappropriate [OE specific] |
11 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 11 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
12 | |||
13 | --- | 12 | --- |
14 | gio/tests/meson.build | 24 ++++++++++++------------ | 13 | gio/tests/meson.build | 24 ++++++++++++------------ |
15 | 1 file changed, 12 insertions(+), 12 deletions(-) | 14 | 1 file changed, 12 insertions(+), 12 deletions(-) |
16 | 15 | ||
17 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build | 16 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build |
18 | index 5dbfb8e..3fd7998 100644 | 17 | index e8d10a0f11f2..abe676767c60 100644 |
19 | --- a/gio/tests/meson.build | 18 | --- a/gio/tests/meson.build |
20 | +++ b/gio/tests/meson.build | 19 | +++ b/gio/tests/meson.build |
21 | @@ -221,7 +221,7 @@ if host_machine.system() != 'windows' | 20 | @@ -250,7 +250,7 @@ if host_machine.system() != 'windows' |
22 | 21 | ||
23 | # Test programs that need to bring up a session bus (requires dbus-daemon) | 22 | # Test programs that need to bring up a session bus (requires dbus-daemon) |
24 | have_dbus_daemon = find_program('dbus-daemon', required : false).found() | 23 | have_dbus_daemon = find_program('dbus-daemon', required : false).found() |
@@ -27,76 +26,78 @@ index 5dbfb8e..3fd7998 100644 | |||
27 | annotate_args = [ | 26 | annotate_args = [ |
28 | '--annotate', 'org.project.Bar', 'Key1', 'Value1', | 27 | '--annotate', 'org.project.Bar', 'Key1', 'Value1', |
29 | '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', | 28 | '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', |
30 | @@ -570,12 +570,12 @@ if installed_tests_enabled | 29 | @@ -601,14 +601,14 @@ if installed_tests_enabled |
31 | endforeach | 30 | endforeach |
32 | endif | 31 | endif |
33 | 32 | ||
34 | -if not meson.is_cross_build() or meson.has_exe_wrapper() | 33 | -if not meson.is_cross_build() or meson.has_exe_wrapper() |
35 | +if meson.is_cross_build() | 34 | +if meson.is_cross_build() |
36 | 35 | ||
36 | compiler_type = '--compiler=@0@'.format(cc.get_id()) | ||
37 | |||
37 | plugin_resources_c = custom_target('plugin-resources.c', | 38 | plugin_resources_c = custom_target('plugin-resources.c', |
38 | input : 'test4.gresource.xml', | 39 | input : 'test4.gresource.xml', |
39 | output : 'plugin-resources.c', | 40 | output : 'plugin-resources.c', |
40 | - command : [glib_compile_resources, | 41 | - command : [glib_compile_resources, |
41 | + command : ['glib-compile-resources', | 42 | + command : ['glib-compile-resources', |
43 | compiler_type, | ||
42 | '--target=@OUTPUT@', | 44 | '--target=@OUTPUT@', |
43 | '--sourcedir=' + meson.current_source_dir(), | 45 | '--sourcedir=' + meson.current_source_dir(), |
44 | '--generate-source', | 46 | @@ -634,7 +634,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
45 | @@ -599,7 +599,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
46 | test_gresource = custom_target('test.gresource', | 47 | test_gresource = custom_target('test.gresource', |
47 | input : 'test.gresource.xml', | 48 | input : 'test.gresource.xml', |
48 | output : 'test.gresource', | 49 | output : 'test.gresource', |
49 | - command : [glib_compile_resources, | 50 | - command : [glib_compile_resources, |
50 | + command : ['glib-compile-resources', | 51 | + command : ['glib-compile-resources', |
52 | compiler_type, | ||
51 | '--target=@OUTPUT@', | 53 | '--target=@OUTPUT@', |
52 | '--sourcedir=' + meson.current_source_dir(), | 54 | '--sourcedir=' + meson.current_source_dir(), |
53 | '--sourcedir=' + meson.current_build_dir(), | 55 | @@ -647,7 +647,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
54 | @@ -610,7 +610,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
55 | test_resources2_c = custom_target('test_resources2.c', | 56 | test_resources2_c = custom_target('test_resources2.c', |
56 | input : 'test3.gresource.xml', | 57 | input : 'test3.gresource.xml', |
57 | output : 'test_resources2.c', | 58 | output : 'test_resources2.c', |
58 | - command : [glib_compile_resources, | 59 | - command : [glib_compile_resources, |
59 | + command : ['glib-compile-resources', | 60 | + command : ['glib-compile-resources', |
61 | compiler_type, | ||
60 | '--target=@OUTPUT@', | 62 | '--target=@OUTPUT@', |
61 | '--sourcedir=' + meson.current_source_dir(), | 63 | '--sourcedir=' + meson.current_source_dir(), |
62 | '--generate', | 64 | @@ -660,7 +660,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
63 | @@ -621,7 +621,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
64 | test_resources2_h = custom_target('test_resources2.h', | 65 | test_resources2_h = custom_target('test_resources2.h', |
65 | input : 'test3.gresource.xml', | 66 | input : 'test3.gresource.xml', |
66 | output : 'test_resources2.h', | 67 | output : 'test_resources2.h', |
67 | - command : [glib_compile_resources, | 68 | - command : [glib_compile_resources, |
68 | + command : ['glib-compile-resources', | 69 | + command : ['glib-compile-resources', |
70 | compiler_type, | ||
69 | '--target=@OUTPUT@', | 71 | '--target=@OUTPUT@', |
70 | '--sourcedir=' + meson.current_source_dir(), | 72 | '--sourcedir=' + meson.current_source_dir(), |
71 | '--generate', | 73 | @@ -674,7 +674,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
72 | @@ -633,7 +633,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
73 | input : 'test2.gresource.xml', | 74 | input : 'test2.gresource.xml', |
74 | depends : big_test_resource, | 75 | depends : big_test_resource, |
75 | output : 'test_resources.c', | 76 | output : 'test_resources.c', |
76 | - command : [glib_compile_resources, | 77 | - command : [glib_compile_resources, |
77 | + command : ['glib-compile-resources', | 78 | + command : ['glib-compile-resources', |
79 | compiler_type, | ||
78 | '--target=@OUTPUT@', | 80 | '--target=@OUTPUT@', |
79 | '--sourcedir=' + meson.current_source_dir(), | 81 | '--sourcedir=' + meson.current_source_dir(), |
80 | '--sourcedir=' + meson.current_build_dir(), | 82 | @@ -687,7 +687,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
81 | @@ -644,7 +644,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
82 | digit_test_resources_c = custom_target('digit_test_resources.c', | 83 | digit_test_resources_c = custom_target('digit_test_resources.c', |
83 | input : '111_digit_test.gresource.xml', | 84 | input : '111_digit_test.gresource.xml', |
84 | output : 'digit_test_resources.c', | 85 | output : 'digit_test_resources.c', |
85 | - command : [glib_compile_resources, | 86 | - command : [glib_compile_resources, |
86 | + command : ['glib-compile-resources', | 87 | + command : ['glib-compile-resources', |
88 | compiler_type, | ||
87 | '--target=@OUTPUT@', | 89 | '--target=@OUTPUT@', |
88 | '--sourcedir=' + meson.current_source_dir(), | 90 | '--sourcedir=' + meson.current_source_dir(), |
89 | '--sourcedir=' + meson.current_build_dir(), | 91 | @@ -700,7 +700,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
90 | @@ -655,7 +655,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
91 | digit_test_resources_h = custom_target('digit_test_resources.h', | 92 | digit_test_resources_h = custom_target('digit_test_resources.h', |
92 | input : '111_digit_test.gresource.xml', | 93 | input : '111_digit_test.gresource.xml', |
93 | output : 'digit_test_resources.h', | 94 | output : 'digit_test_resources.h', |
94 | - command : [glib_compile_resources, | 95 | - command : [glib_compile_resources, |
95 | + command : ['glib-compile-resources', | 96 | + command : ['glib-compile-resources', |
97 | compiler_type, | ||
96 | '--target=@OUTPUT@', | 98 | '--target=@OUTPUT@', |
97 | '--sourcedir=' + meson.current_source_dir(), | 99 | '--sourcedir=' + meson.current_source_dir(), |
98 | '--generate', | 100 | @@ -742,11 +742,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
99 | @@ -688,11 +688,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
100 | 101 | ||
101 | ld = find_program('ld', required : false) | 102 | ld = find_program('ld', required : false) |
102 | 103 | ||
@@ -107,15 +108,18 @@ index 5dbfb8e..3fd7998 100644 | |||
107 | output : 'test5.gresource', | 108 | output : 'test5.gresource', |
108 | - command : [glib_compile_resources, | 109 | - command : [glib_compile_resources, |
109 | + command : ['glib-compile-resources', | 110 | + command : ['glib-compile-resources', |
111 | compiler_type, | ||
110 | '--target=@OUTPUT@', | 112 | '--target=@OUTPUT@', |
111 | '--sourcedir=' + meson.current_source_dir(), | 113 | '--sourcedir=' + meson.current_source_dir(), |
112 | '--sourcedir=' + meson.current_build_dir(), | 114 | @@ -760,7 +760,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
113 | @@ -704,7 +704,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
114 | test_resources_binary_c = custom_target('test_resources_binary.c', | 115 | test_resources_binary_c = custom_target('test_resources_binary.c', |
115 | input : 'test5.gresource.xml', | 116 | input : 'test5.gresource.xml', |
116 | output : 'test_resources_binary.c', | 117 | output : 'test_resources_binary.c', |
117 | - command : [glib_compile_resources, | 118 | - command : [glib_compile_resources, |
118 | + command : ['glib-compile-resources', | 119 | + command : ['glib-compile-resources', |
120 | compiler_type, | ||
119 | '--target=@OUTPUT@', | 121 | '--target=@OUTPUT@', |
120 | '--sourcedir=' + meson.current_source_dir(), | 122 | '--sourcedir=' + meson.current_source_dir(), |
121 | '--sourcedir=' + meson.current_build_dir(), | 123 | -- |
124 | 2.34.1 | ||
125 | |||