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 | 32 |
1 files changed, 16 insertions, 16 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 48899ce852..41ecfa1df8 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 0061d66057dfd7e7267772df60b36474fb180eed Mon Sep 17 00:00:00 2001 | 1 | From 7cde170afe6854d674b50e32b4c1d3b511be9abe 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 |
@@ -15,10 +15,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
15 | 1 file changed, 12 insertions(+), 12 deletions(-) | 15 | 1 file changed, 12 insertions(+), 12 deletions(-) |
16 | 16 | ||
17 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build | 17 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build |
18 | index 382dfcc..c171717 100644 | 18 | index 788cf97..dab65d2 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 | @@ -191,7 +191,7 @@ if host_machine.system() != 'windows' | 21 | @@ -203,7 +203,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,8 +27,8 @@ index 382dfcc..c171717 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 | @@ -465,12 +465,12 @@ if installed_tests_enabled | 30 | @@ -548,12 +548,12 @@ if installed_tests_enabled |
31 | install_data('static-link.py', install_dir : installed_tests_execdir) | 31 | endforeach |
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() |
@@ -42,7 +42,7 @@ index 382dfcc..c171717 100644 | |||
42 | '--target=@OUTPUT@', | 42 | '--target=@OUTPUT@', |
43 | '--sourcedir=' + meson.current_source_dir(), | 43 | '--sourcedir=' + meson.current_source_dir(), |
44 | '--generate-source', | 44 | '--generate-source', |
45 | @@ -494,7 +494,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 45 | @@ -577,7 +577,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
46 | test_gresource = custom_target('test.gresource', | 46 | test_gresource = custom_target('test.gresource', |
47 | input : 'test.gresource.xml', | 47 | input : 'test.gresource.xml', |
48 | output : 'test.gresource', | 48 | output : 'test.gresource', |
@@ -51,7 +51,7 @@ index 382dfcc..c171717 100644 | |||
51 | '--target=@OUTPUT@', | 51 | '--target=@OUTPUT@', |
52 | '--sourcedir=' + meson.current_source_dir(), | 52 | '--sourcedir=' + meson.current_source_dir(), |
53 | '--sourcedir=' + meson.current_build_dir(), | 53 | '--sourcedir=' + meson.current_build_dir(), |
54 | @@ -505,7 +505,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 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', | 55 | test_resources2_c = custom_target('test_resources2.c', |
56 | input : 'test3.gresource.xml', | 56 | input : 'test3.gresource.xml', |
57 | output : 'test_resources2.c', | 57 | output : 'test_resources2.c', |
@@ -60,7 +60,7 @@ index 382dfcc..c171717 100644 | |||
60 | '--target=@OUTPUT@', | 60 | '--target=@OUTPUT@', |
61 | '--sourcedir=' + meson.current_source_dir(), | 61 | '--sourcedir=' + meson.current_source_dir(), |
62 | '--generate', | 62 | '--generate', |
63 | @@ -516,7 +516,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 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', | 64 | test_resources2_h = custom_target('test_resources2.h', |
65 | input : 'test3.gresource.xml', | 65 | input : 'test3.gresource.xml', |
66 | output : 'test_resources2.h', | 66 | output : 'test_resources2.h', |
@@ -69,7 +69,7 @@ index 382dfcc..c171717 100644 | |||
69 | '--target=@OUTPUT@', | 69 | '--target=@OUTPUT@', |
70 | '--sourcedir=' + meson.current_source_dir(), | 70 | '--sourcedir=' + meson.current_source_dir(), |
71 | '--generate', | 71 | '--generate', |
72 | @@ -528,7 +528,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 72 | @@ -611,7 +611,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
73 | input : 'test2.gresource.xml', | 73 | input : 'test2.gresource.xml', |
74 | depends : big_test_resource, | 74 | depends : big_test_resource, |
75 | output : 'test_resources.c', | 75 | output : 'test_resources.c', |
@@ -78,7 +78,7 @@ index 382dfcc..c171717 100644 | |||
78 | '--target=@OUTPUT@', | 78 | '--target=@OUTPUT@', |
79 | '--sourcedir=' + meson.current_source_dir(), | 79 | '--sourcedir=' + meson.current_source_dir(), |
80 | '--sourcedir=' + meson.current_build_dir(), | 80 | '--sourcedir=' + meson.current_build_dir(), |
81 | @@ -539,7 +539,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 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', | 82 | digit_test_resources_c = custom_target('digit_test_resources.c', |
83 | input : '111_digit_test.gresource.xml', | 83 | input : '111_digit_test.gresource.xml', |
84 | output : 'digit_test_resources.c', | 84 | output : 'digit_test_resources.c', |
@@ -87,7 +87,7 @@ index 382dfcc..c171717 100644 | |||
87 | '--target=@OUTPUT@', | 87 | '--target=@OUTPUT@', |
88 | '--sourcedir=' + meson.current_source_dir(), | 88 | '--sourcedir=' + meson.current_source_dir(), |
89 | '--sourcedir=' + meson.current_build_dir(), | 89 | '--sourcedir=' + meson.current_build_dir(), |
90 | @@ -550,7 +550,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 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', | 91 | digit_test_resources_h = custom_target('digit_test_resources.h', |
92 | input : '111_digit_test.gresource.xml', | 92 | input : '111_digit_test.gresource.xml', |
93 | output : 'digit_test_resources.h', | 93 | output : 'digit_test_resources.h', |
@@ -96,11 +96,11 @@ index 382dfcc..c171717 100644 | |||
96 | '--target=@OUTPUT@', | 96 | '--target=@OUTPUT@', |
97 | '--sourcedir=' + meson.current_source_dir(), | 97 | '--sourcedir=' + meson.current_source_dir(), |
98 | '--generate', | 98 | '--generate', |
99 | @@ -579,11 +579,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 99 | @@ -668,11 +668,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() |
100 | # LLVM once that support is in a stable release. | ||
101 | objcopy = find_program('objcopy', required : false) | ||
102 | 100 | ||
103 | - if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() | 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() | 104 | + if not meson.is_cross_build() |
105 | test_gresource_binary = custom_target('test5.gresource', | 105 | test_gresource_binary = custom_target('test5.gresource', |
106 | input : 'test5.gresource.xml', | 106 | input : 'test5.gresource.xml', |
@@ -110,7 +110,7 @@ index 382dfcc..c171717 100644 | |||
110 | '--target=@OUTPUT@', | 110 | '--target=@OUTPUT@', |
111 | '--sourcedir=' + meson.current_source_dir(), | 111 | '--sourcedir=' + meson.current_source_dir(), |
112 | '--sourcedir=' + meson.current_build_dir(), | 112 | '--sourcedir=' + meson.current_build_dir(), |
113 | @@ -595,7 +595,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | 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', | 114 | test_resources_binary_c = custom_target('test_resources_binary.c', |
115 | input : 'test5.gresource.xml', | 115 | input : 'test5.gresource.xml', |
116 | output : 'test_resources_binary.c', | 116 | output : 'test_resources_binary.c', |