diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-20 21:10:26 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 12:35:59 +0000 |
commit | a3ebd8a19de79c0dbd83a8430acfcffadbda48e7 (patch) | |
tree | 4cffcb52e5f62c8685938e8d2d8428bb23c04856 /meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch | |
parent | ce0d8dbbf01960a13e5883fa036acef346c56c85 (diff) | |
download | poky-a3ebd8a19de79c0dbd83a8430acfcffadbda48e7.tar.gz |
glib-2.0: convert from autotools to meson
PRINTF settings no longer seem necessary (tested with mingw).
Add meson-specific bits to Enable-more-tests-while-cross-compiling.patch and
0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
Add 0001-Set-host_machine-correctly-when-building-with-mingw3.patch
to allow 'mingw32' as target machine in addition to 'windows'.
Add 0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch to
correct ARM build errors.
Drop configure-libtool.patch (autotools-specific).
Fix API docs generation
(From OE-Core rev: e185235dd97510bfdc621cef9c18d8d13b16006d)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 91 |
1 files changed, 88 insertions, 3 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 5060880926..5ccd3203fb 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 70e462e070f8eb20b7660c1cf88271c0449e43cc Mon Sep 17 00:00:00 2001 | 1 | From 1481c6d5f08f9dbbe10abc87b372a1f61db36476 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 |
@@ -10,8 +10,10 @@ case we can depend on glib-2.0-native. | |||
10 | Upstream-Status: Inappropriate [OE specific] | 10 | Upstream-Status: Inappropriate [OE specific] |
11 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 11 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
12 | --- | 12 | --- |
13 | gio/tests/Makefile.am | 10 ++++++---- | 13 | gio/tests/Makefile.am | 10 ++++++---- |
14 | 1 file changed, 6 insertions(+), 4 deletions(-) | 14 | gio/tests/meson.build | 15 ++++++++------- |
15 | tests/gobject/Makefile.am | 6 ++++++ | ||
16 | 3 files changed, 20 insertions(+), 11 deletions(-) | ||
15 | 17 | ||
16 | diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am | 18 | diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
17 | index c4e7a92..633e85c 100644 | 19 | index c4e7a92..633e85c 100644 |
@@ -50,3 +52,86 @@ index c4e7a92..633e85c 100644 | |||
50 | 52 | ||
51 | BUILT_SOURCES += giotypefuncs.inc | 53 | BUILT_SOURCES += giotypefuncs.inc |
52 | 54 | ||
55 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build | ||
56 | index dca33bd..181f5c7 100644 | ||
57 | --- a/gio/tests/meson.build | ||
58 | +++ b/gio/tests/meson.build | ||
59 | @@ -173,7 +173,7 @@ if host_machine.system() != 'windows' | ||
60 | |||
61 | # Test programs that need to bring up a session bus (requires dbus-daemon) | ||
62 | have_dbus_daemon = find_program('dbus-daemon', required : false).found() | ||
63 | - if have_dbus_daemon | ||
64 | + if true | ||
65 | annotate_args = [ | ||
66 | '--annotate', 'org.project.Bar', 'Key1', 'Value1', | ||
67 | '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', | ||
68 | @@ -406,12 +406,13 @@ if installed_tests_enabled | ||
69 | install_subdir('cert-tests', install_dir : installed_tests_execdir) | ||
70 | endif | ||
71 | |||
72 | -if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
73 | +#if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
74 | +if meson.is_cross_build() | ||
75 | |||
76 | plugin_resources_c = custom_target('plugin-resources.c', | ||
77 | input : 'test4.gresource.xml', | ||
78 | output : 'plugin-resources.c', | ||
79 | - command : [glib_compile_resources, | ||
80 | + command : ['glib-compile-resources', | ||
81 | '--target=@OUTPUT@', | ||
82 | '--sourcedir=' + meson.current_source_dir(), | ||
83 | '--generate-source', | ||
84 | @@ -428,7 +429,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
85 | test_gresource = custom_target('test.gresource', | ||
86 | input : 'test.gresource.xml', | ||
87 | output : 'test.gresource', | ||
88 | - command : [glib_compile_resources, | ||
89 | + command : ['glib-compile-resources', | ||
90 | '--target=@OUTPUT@', | ||
91 | '--sourcedir=' + meson.current_source_dir(), | ||
92 | '--sourcedir=' + meson.current_build_dir(), | ||
93 | @@ -439,7 +440,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
94 | test_resources2_c = custom_target('test_resources2.c', | ||
95 | input : 'test3.gresource.xml', | ||
96 | output : 'test_resources2.c', | ||
97 | - command : [glib_compile_resources, | ||
98 | + command : ['glib-compile-resources', | ||
99 | '--target=@OUTPUT@', | ||
100 | '--sourcedir=' + meson.current_source_dir(), | ||
101 | '--generate', | ||
102 | @@ -450,7 +451,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
103 | test_resources2_h = custom_target('test_resources2.h', | ||
104 | input : 'test3.gresource.xml', | ||
105 | output : 'test_resources2.h', | ||
106 | - command : [glib_compile_resources, | ||
107 | + command : ['glib-compile-resources', | ||
108 | '--target=@OUTPUT@', | ||
109 | '--sourcedir=' + meson.current_source_dir(), | ||
110 | '--generate', | ||
111 | @@ -461,7 +462,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() | ||
112 | test_resources_c = custom_target('test_resources.c', | ||
113 | input : 'test2.gresource.xml', | ||
114 | output : 'test_resources.c', | ||
115 | - command : [glib_compile_resources, | ||
116 | + command : ['glib-compile-resources', | ||
117 | '--target=@OUTPUT@', | ||
118 | '--sourcedir=' + meson.current_source_dir(), | ||
119 | '--generate-source', | ||
120 | diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am | ||
121 | index 1bcefbe..77e646a 100644 | ||
122 | --- a/tests/gobject/Makefile.am | ||
123 | +++ b/tests/gobject/Makefile.am | ||
124 | @@ -51,7 +51,13 @@ if ENABLE_TIMELOOP | ||
125 | installed_test_programs += timeloop-closure | ||
126 | endif | ||
127 | |||
128 | +# The marshal test requires running a binary, which means we require | ||
129 | +# glib-native when cross-compiling | ||
130 | +if !CROSS_COMPILING | ||
131 | glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal | ||
132 | +else | ||
133 | +glib_genmarshal=$(shell which glib-genmarshal) | ||
134 | +endif | ||
135 | |||
136 | testmarshal.h: stamp-testmarshal.h | ||
137 | @true | ||