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 | 26 |
1 files changed, 13 insertions, 13 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 41ecfa1df8..9bbb33ffc1 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 @@ -From 7cde170afe6854d674b50e32b4c1d3b511be9abe Mon Sep 17 00:00:00 2001 +From 73b1c416674d285b021e218da1a3ddb884e606da Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Mon, 9 Nov 2015 11:07:27 +0200 Subject: [PATCH] Enable more tests while cross-compiling @@ -15,10 +15,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 788cf97..dab65d2 100644 +index 5dbfb8e..3fd7998 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -203,7 +203,7 @@ if host_machine.system() != 'windows' +@@ -221,7 +221,7 @@ if host_machine.system() != 'windows' # Test programs that need to bring up a session bus (requires dbus-daemon) have_dbus_daemon = find_program('dbus-daemon', required : false).found() @@ -27,7 +27,7 @@ index 788cf97..dab65d2 100644 annotate_args = [ '--annotate', 'org.project.Bar', 'Key1', 'Value1', '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', -@@ -548,12 +548,12 @@ if installed_tests_enabled +@@ -570,12 +570,12 @@ if installed_tests_enabled endforeach endif @@ -42,7 +42,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate-source', -@@ -577,7 +577,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -599,7 +599,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_gresource = custom_target('test.gresource', input : 'test.gresource.xml', output : 'test.gresource', @@ -51,7 +51,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -588,7 +588,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -610,7 +610,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources2_c = custom_target('test_resources2.c', input : 'test3.gresource.xml', output : 'test_resources2.c', @@ -60,7 +60,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -599,7 +599,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -621,7 +621,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources2_h = custom_target('test_resources2.h', input : 'test3.gresource.xml', output : 'test_resources2.h', @@ -69,7 +69,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -611,7 +611,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -633,7 +633,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() input : 'test2.gresource.xml', depends : big_test_resource, output : 'test_resources.c', @@ -78,7 +78,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -622,7 +622,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -644,7 +644,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() digit_test_resources_c = custom_target('digit_test_resources.c', input : '111_digit_test.gresource.xml', output : 'digit_test_resources.c', @@ -87,7 +87,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -633,7 +633,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -655,7 +655,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() digit_test_resources_h = custom_target('digit_test_resources.h', input : '111_digit_test.gresource.xml', output : 'digit_test_resources.h', @@ -96,11 +96,11 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -668,11 +668,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -688,11 +688,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() ld = find_program('ld', required : false) -- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found() +- if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() + if not meson.is_cross_build() test_gresource_binary = custom_target('test5.gresource', input : 'test5.gresource.xml', @@ -110,7 +110,7 @@ index 788cf97..dab65d2 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -684,7 +684,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -704,7 +704,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() test_resources_binary_c = custom_target('test_resources_binary.c', input : 'test5.gresource.xml', output : 'test_resources_binary.c', |