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/0001-Set-host_machine-correctly-when-building-with-mingw3.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/0001-Set-host_machine-correctly-when-building-with-mingw3.patch')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch | 104 |
1 files changed, 104 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch new file mode 100644 index 0000000000..2b7fab7bde --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch | |||
@@ -0,0 +1,104 @@ | |||
1 | From 4169f11beedacfbb8c7934a4c99189d44935a6b9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 13 Feb 2019 15:32:05 +0100 | ||
4 | Subject: [PATCH] Set host_machine correctly when building with mingw32 | ||
5 | |||
6 | Upstream-Status: Inappropriate [oe-core specific] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | |||
9 | --- | ||
10 | gio/tests/meson.build | 8 ++++---- | ||
11 | glib/tests/meson.build | 4 ++-- | ||
12 | meson.build | 3 +++ | ||
13 | tests/meson.build | 2 +- | ||
14 | 4 files changed, 10 insertions(+), 7 deletions(-) | ||
15 | |||
16 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build | ||
17 | index 181f5c7..11a1f12 100644 | ||
18 | --- a/gio/tests/meson.build | ||
19 | +++ b/gio/tests/meson.build | ||
20 | @@ -12,7 +12,7 @@ test_c_args = [ | ||
21 | '-DGLIB_COMPILE_SCHEMAS="@0@"'.format(glib_compile_schemas.full_path()), | ||
22 | ] | ||
23 | |||
24 | -if host_machine.system() == 'windows' | ||
25 | +if host_system == 'windows' | ||
26 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] | ||
27 | endif | ||
28 | |||
29 | @@ -122,7 +122,7 @@ if dbus1_dep.found() | ||
30 | endif | ||
31 | |||
32 | # Test programs buildable on UNIX only | ||
33 | -if host_machine.system() != 'windows' | ||
34 | +if host_system != 'windows' | ||
35 | gio_tests += [{ | ||
36 | 'file' : {}, | ||
37 | 'gdbus-peer' : { | ||
38 | @@ -314,7 +314,7 @@ if host_machine.system() != 'windows' | ||
39 | endif # unix | ||
40 | |||
41 | # Test programs buildable on Windows only | ||
42 | -if host_machine.system() == 'windows' | ||
43 | +if host_system == 'windows' | ||
44 | gio_tests += [{'win32-streams' : {}}] | ||
45 | endif | ||
46 | |||
47 | @@ -379,7 +379,7 @@ if cc.get_id() != 'msvc' | ||
48 | }] | ||
49 | endif | ||
50 | |||
51 | -if host_machine.system() != 'windows' | ||
52 | +if host_system != 'windows' | ||
53 | test_extra_programs += [{ | ||
54 | 'gdbus-example-unix-fd-client' : { | ||
55 | 'install' : false, | ||
56 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build | ||
57 | index d7b6a7a..6678a08 100644 | ||
58 | --- a/glib/tests/meson.build | ||
59 | +++ b/glib/tests/meson.build | ||
60 | @@ -45,7 +45,7 @@ glib_tests = { | ||
61 | 'hook' : {}, | ||
62 | 'hostutils' : {}, | ||
63 | 'include' : { | ||
64 | - 'skip' : host_machine.system() == 'windows', | ||
65 | + 'skip' : host_system == 'windows', | ||
66 | }, | ||
67 | 'keyfile' : {}, | ||
68 | 'list' : {}, | ||
69 | @@ -112,7 +112,7 @@ glib_tests = { | ||
70 | 'utils' : {}, | ||
71 | 'unicode' : {}, | ||
72 | 'unix' : { | ||
73 | - 'skip' : host_machine.system() == 'windows', | ||
74 | + 'skip' : host_system == 'windows', | ||
75 | }, | ||
76 | 'uri' : {}, | ||
77 | '1bit-mutex' : {}, | ||
78 | diff --git a/meson.build b/meson.build | ||
79 | index f7405a2..4348f20 100644 | ||
80 | --- a/meson.build | ||
81 | +++ b/meson.build | ||
82 | @@ -31,6 +31,9 @@ else | ||
83 | endif | ||
84 | |||
85 | host_system = host_machine.system() | ||
86 | +if host_system == 'mingw32' | ||
87 | + host_system = 'windows' | ||
88 | +endif | ||
89 | |||
90 | glib_version = meson.project_version() | ||
91 | glib_api_version = '2.0' | ||
92 | diff --git a/tests/meson.build b/tests/meson.build | ||
93 | index 80e45d7..9f3869f 100644 | ||
94 | --- a/tests/meson.build | ||
95 | +++ b/tests/meson.build | ||
96 | @@ -67,7 +67,7 @@ test_extra_programs = { | ||
97 | 'unicode-collate' : {}, | ||
98 | } | ||
99 | |||
100 | -if host_machine.system() != 'windows' | ||
101 | +if host_system != 'windows' | ||
102 | tests += [{ | ||
103 | 'timeloop' : {}, | ||
104 | 'spawn-test' : {}, | ||