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, 15 insertions, 17 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 6147bdae46..f5c161fe04 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 d2d7af496b4f4a13779179dbcbb98de56b09783f Mon Sep 17 00:00:00 2001 +From 1f3c05529c0c9032ae0a289fb1f088b7541fc9b0 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 @@ -9,24 +9,25 @@ 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 e8d10a0f11f2..abe676767c60 100644 +index 3ed23a5..5df932a 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -250,7 +250,7 @@ if host_machine.system() != 'windows' +@@ -253,7 +253,7 @@ if host_machine.system() != 'windows' + } + endif - # 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', -@@ -601,14 +601,14 @@ if installed_tests_enabled +@@ -603,14 +603,14 @@ if installed_tests_enabled endforeach endif @@ -43,7 +44,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -634,7 +634,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -636,7 +636,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 +53,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -647,7 +647,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -649,7 +649,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 +62,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -660,7 +660,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -662,7 +662,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 +71,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -674,7 +674,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -676,7 +676,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 +80,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -687,7 +687,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -689,7 +689,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 +89,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -700,7 +700,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -702,7 +702,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,7 +98,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -742,11 +742,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -744,11 +744,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() ld = find_program('ld', required : false) @@ -111,7 +112,7 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), -@@ -760,7 +760,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() +@@ -762,7 +762,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', @@ -120,6 +121,3 @@ index e8d10a0f11f2..abe676767c60 100644 compiler_type, '--target=@OUTPUT@', '--sourcedir=' + meson.current_source_dir(), --- -2.34.1 - |