diff options
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 | 20 |
1 files changed, 10 insertions, 10 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 index d075cd3f23..d6765b163b 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From d3334e83ae0da9ca184eb9c8daf0854544ece023 Mon Sep 17 00:00:00 2001 | 1 | From 333809ded70ad4e3470b7134e3fac1a42ff48e61 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 13 Feb 2019 15:32:05 +0100 | 3 | Date: Wed, 13 Feb 2019 15:32:05 +0100 |
4 | Subject: [PATCH] Set host_machine correctly when building with mingw32 | 4 | Subject: [PATCH] Set host_machine correctly when building with mingw32 |
@@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 4 files changed, 9 insertions(+), 6 deletions(-) | 14 | 4 files changed, 9 insertions(+), 6 deletions(-) |
15 | 15 | ||
16 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build | 16 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build |
17 | index dab65d2..e8bb2ee 100644 | 17 | index 3a19c82..b762835 100644 |
18 | --- a/gio/tests/meson.build | 18 | --- a/gio/tests/meson.build |
19 | +++ b/gio/tests/meson.build | 19 | +++ b/gio/tests/meson.build |
20 | @@ -12,7 +12,7 @@ test_c_args = [ | 20 | @@ -12,7 +12,7 @@ test_c_args = [ |
@@ -26,7 +26,7 @@ index dab65d2..e8bb2ee 100644 | |||
26 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] | 26 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] |
27 | endif | 27 | endif |
28 | 28 | ||
29 | @@ -132,7 +132,7 @@ else | 29 | @@ -133,7 +133,7 @@ else |
30 | endif | 30 | endif |
31 | 31 | ||
32 | # Test programs buildable on UNIX only | 32 | # Test programs buildable on UNIX only |
@@ -35,7 +35,7 @@ index dab65d2..e8bb2ee 100644 | |||
35 | gio_tests += { | 35 | gio_tests += { |
36 | 'file' : {}, | 36 | 'file' : {}, |
37 | 'gdbus-peer' : { | 37 | 'gdbus-peer' : { |
38 | @@ -384,7 +384,7 @@ if host_machine.system() != 'windows' | 38 | @@ -385,7 +385,7 @@ if host_machine.system() != 'windows' |
39 | endif # unix | 39 | endif # unix |
40 | 40 | ||
41 | # Test programs buildable on Windows only | 41 | # Test programs buildable on Windows only |
@@ -44,7 +44,7 @@ index dab65d2..e8bb2ee 100644 | |||
44 | gio_tests += {'win32-streams' : {}} | 44 | gio_tests += {'win32-streams' : {}} |
45 | endif | 45 | endif |
46 | 46 | ||
47 | @@ -454,7 +454,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' | 47 | @@ -455,7 +455,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' |
48 | } | 48 | } |
49 | endif | 49 | endif |
50 | 50 | ||
@@ -54,10 +54,10 @@ index dab65d2..e8bb2ee 100644 | |||
54 | 'gdbus-example-unix-fd-client' : { | 54 | 'gdbus-example-unix-fd-client' : { |
55 | 'install' : false, | 55 | 'install' : false, |
56 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build | 56 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build |
57 | index 3dedafc..94605e6 100644 | 57 | index 6eb23e8..36eb919 100644 |
58 | --- a/glib/tests/meson.build | 58 | --- a/glib/tests/meson.build |
59 | +++ b/glib/tests/meson.build | 59 | +++ b/glib/tests/meson.build |
60 | @@ -134,7 +134,7 @@ if glib_conf.has('HAVE_EVENTFD') | 60 | @@ -137,7 +137,7 @@ if glib_conf.has('HAVE_EVENTFD') |
61 | } | 61 | } |
62 | endif | 62 | endif |
63 | 63 | ||
@@ -67,7 +67,7 @@ index 3dedafc..94605e6 100644 | |||
67 | glib_tests += { | 67 | glib_tests += { |
68 | 'gpoll' : { | 68 | 'gpoll' : { |
69 | diff --git a/meson.build b/meson.build | 69 | diff --git a/meson.build b/meson.build |
70 | index e1b4b79..afb6eaa 100644 | 70 | index 47f3a5c..7ea7ad1 100644 |
71 | --- a/meson.build | 71 | --- a/meson.build |
72 | +++ b/meson.build | 72 | +++ b/meson.build |
73 | @@ -32,6 +32,9 @@ else | 73 | @@ -32,6 +32,9 @@ else |
@@ -78,8 +78,8 @@ index e1b4b79..afb6eaa 100644 | |||
78 | + host_system = 'windows' | 78 | + host_system = 'windows' |
79 | +endif | 79 | +endif |
80 | 80 | ||
81 | glib_version = meson.project_version() | 81 | if host_system == 'darwin' |
82 | glib_api_version = '2.0' | 82 | ios_test_code = '''#include <TargetConditionals.h> |
83 | diff --git a/tests/meson.build b/tests/meson.build | 83 | diff --git a/tests/meson.build b/tests/meson.build |
84 | index 6741f8f..12fdc90 100644 | 84 | index 6741f8f..12fdc90 100644 |
85 | --- a/tests/meson.build | 85 | --- a/tests/meson.build |