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 | 36 |
1 files changed, 17 insertions, 19 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 @@ -From 23cd157352ac8a53f992ddc6d6d01caadf1c79bc Mon Sep 17 00:00:00 2001 +From 0061d66057dfd7e7267772df60b36474fb180eed 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 @@ -11,14 +11,14 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- - gio/tests/meson.build | 26 ++++++++++++++------------ - 1 file changed, 14 insertions(+), 12 deletions(-) + gio/tests/meson.build | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 65f43e2..028b196 100644 +index 382dfcc..c171717 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -185,7 +185,7 @@ if host_machine.system() != 'windows' +@@ -191,7 +191,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,12 +27,11 @@ index 65f43e2..028b196 100644 annotate_args = [ '--annotate', 'org.project.Bar', 'Key1', 'Value1', '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', -@@ -453,12 +453,13 @@ if installed_tests_enabled +@@ -465,12 +465,12 @@ if installed_tests_enabled install_data('static-link.py', install_dir : installed_tests_execdir) endif -if not meson.is_cross_build() or meson.has_exe_wrapper() -+#if not meson.is_cross_build() or meson.has_exe_wrapper() +if meson.is_cross_build() plugin_resources_c = custom_target('plugin-resources.c', @@ -43,7 +42,7 @@ index 65f43e2..028b196 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate-source', -@@ -482,7 +483,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -494,7 +494,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', @@ -52,7 +51,7 @@ index 65f43e2..028b196 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -493,7 +494,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -505,7 +505,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', @@ -61,7 +60,7 @@ index 65f43e2..028b196 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -504,7 +505,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -516,7 +516,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', @@ -70,7 +69,7 @@ index 65f43e2..028b196 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -516,7 +517,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -528,7 +528,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() input : 'test2.gresource.xml', depends : big_test_resource, output : 'test_resources.c', @@ -79,7 +78,7 @@ index 65f43e2..028b196 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -527,7 +528,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -539,7 +539,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', @@ -88,7 +87,7 @@ index 65f43e2..028b196 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -538,7 +539,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -550,7 +550,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', @@ -97,12 +96,11 @@ index 65f43e2..028b196 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--generate', -@@ -565,11 +566,12 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - # Support for --add-symbol was added to LLVM objcopy in 2019 - # (https://reviews.llvm.org/D58234). FIXME: This test could be enabled for +@@ -579,11 +579,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() # LLVM once that support is in a stable release. -- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' -+ #if build_machine.system() == 'linux' and cc.get_id() == 'gcc' + objcopy = find_program('objcopy', required : false) + +- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() + if not meson.is_cross_build() test_gresource_binary = custom_target('test5.gresource', input : 'test5.gresource.xml', @@ -112,7 +110,7 @@ index 65f43e2..028b196 100644 '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), '--sourcedir=' + meson.current_build_dir(), -@@ -581,7 +583,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -595,7 +595,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', |