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 | 121 |
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 @@ -From 7cde170afe6854d674b50e32b4c1d3b511be9abe 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 - -Upstream disables a few tests while cross-compiling because their build requires -running other built binaries. This usually makes sense but in the cross-compile -case we can depend on glib-2.0-native. - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> - ---- - 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 788cf97..dab65d2 100644 ---- a/gio/tests/meson.build -+++ b/gio/tests/meson.build -@@ -203,7 +203,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() -- if have_dbus_daemon -+ if true - 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 - endforeach - endif - --if not meson.is_cross_build() or meson.has_exe_wrapper() -+if meson.is_cross_build() - - plugin_resources_c = custom_target('plugin-resources.c', - input : 'test4.gresource.xml', - output : 'plugin-resources.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--generate-source', -@@ -577,7 +577,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', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--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() - test_resources2_c = custom_target('test_resources2.c', - input : 'test3.gresource.xml', - output : 'test_resources2.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--generate', -@@ -599,7 +599,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', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--generate', -@@ -611,7 +611,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - input : 'test2.gresource.xml', - depends : big_test_resource, - output : 'test_resources.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--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() - digit_test_resources_c = custom_target('digit_test_resources.c', - input : '111_digit_test.gresource.xml', - output : 'digit_test_resources.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--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() - digit_test_resources_h = custom_target('digit_test_resources.h', - input : '111_digit_test.gresource.xml', - output : 'digit_test_resources.h', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--generate', -@@ -668,11 +668,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 not meson.is_cross_build() - test_gresource_binary = custom_target('test5.gresource', - input : 'test5.gresource.xml', - output : 'test5.gresource', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--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() - test_resources_binary_c = custom_target('test_resources_binary.c', - input : 'test5.gresource.xml', - output : 'test_resources_binary.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--sourcedir=' + meson.current_build_dir(), |