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 | 43 |
1 files changed, 14 insertions, 29 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 d6765b163b..32b4cea409 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,32 +1,30 @@ | |||
1 | From 333809ded70ad4e3470b7134e3fac1a42ff48e61 Mon Sep 17 00:00:00 2001 | 1 | From c0733f7a91dfe13152abc60c5a3064456b3e9d63 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 |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
8 | |||
9 | --- | 8 | --- |
10 | gio/tests/meson.build | 8 ++++---- | 9 | gio/tests/meson.build | 8 ++++---- |
11 | glib/tests/meson.build | 2 +- | 10 | glib/tests/meson.build | 2 +- |
12 | meson.build | 3 +++ | 11 | meson.build | 3 +++ |
13 | tests/meson.build | 2 +- | 12 | 3 files changed, 8 insertions(+), 5 deletions(-) |
14 | 4 files changed, 9 insertions(+), 6 deletions(-) | ||
15 | 13 | ||
16 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build | 14 | diff --git a/gio/tests/meson.build b/gio/tests/meson.build |
17 | index 3a19c82..b762835 100644 | 15 | index 4ef3343..e498e7e 100644 |
18 | --- a/gio/tests/meson.build | 16 | --- a/gio/tests/meson.build |
19 | +++ b/gio/tests/meson.build | 17 | +++ b/gio/tests/meson.build |
20 | @@ -12,7 +12,7 @@ test_c_args = [ | 18 | @@ -29,7 +29,7 @@ endif |
21 | '-UG_DISABLE_ASSERT', | 19 | |
22 | ] | 20 | test_cpp_args = test_c_args |
23 | 21 | ||
24 | -if host_machine.system() == 'windows' | 22 | -if host_machine.system() == 'windows' |
25 | +if host_system == 'windows' | 23 | +if host_system == 'windows' |
26 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] | 24 | common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] |
27 | endif | 25 | endif |
28 | 26 | ||
29 | @@ -133,7 +133,7 @@ else | 27 | @@ -230,7 +230,7 @@ if have_dbus_daemon |
30 | endif | 28 | endif |
31 | 29 | ||
32 | # Test programs buildable on UNIX only | 30 | # Test programs buildable on UNIX only |
@@ -34,8 +32,8 @@ index 3a19c82..b762835 100644 | |||
34 | +if host_system != 'windows' | 32 | +if host_system != 'windows' |
35 | gio_tests += { | 33 | gio_tests += { |
36 | 'file' : {}, | 34 | 'file' : {}, |
37 | 'gdbus-peer' : { | 35 | 'gdbus-peer-object-manager' : {}, |
38 | @@ -385,7 +385,7 @@ if host_machine.system() != 'windows' | 36 | @@ -562,7 +562,7 @@ if host_machine.system() != 'windows' |
39 | endif # unix | 37 | endif # unix |
40 | 38 | ||
41 | # Test programs buildable on Windows only | 39 | # Test programs buildable on Windows only |
@@ -44,7 +42,7 @@ index 3a19c82..b762835 100644 | |||
44 | gio_tests += {'win32-streams' : {}} | 42 | gio_tests += {'win32-streams' : {}} |
45 | endif | 43 | endif |
46 | 44 | ||
47 | @@ -455,7 +455,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' | 45 | @@ -632,7 +632,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' |
48 | } | 46 | } |
49 | endif | 47 | endif |
50 | 48 | ||
@@ -54,10 +52,10 @@ index 3a19c82..b762835 100644 | |||
54 | 'gdbus-example-unix-fd-client' : { | 52 | 'gdbus-example-unix-fd-client' : { |
55 | 'install' : false, | 53 | 'install' : false, |
56 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build | 54 | diff --git a/glib/tests/meson.build b/glib/tests/meson.build |
57 | index 6eb23e8..36eb919 100644 | 55 | index d80c86e..5329cda 100644 |
58 | --- a/glib/tests/meson.build | 56 | --- a/glib/tests/meson.build |
59 | +++ b/glib/tests/meson.build | 57 | +++ b/glib/tests/meson.build |
60 | @@ -137,7 +137,7 @@ if glib_conf.has('HAVE_EVENTFD') | 58 | @@ -216,7 +216,7 @@ if glib_conf.has('HAVE_EVENTFD') |
61 | } | 59 | } |
62 | endif | 60 | endif |
63 | 61 | ||
@@ -67,10 +65,10 @@ index 6eb23e8..36eb919 100644 | |||
67 | glib_tests += { | 65 | glib_tests += { |
68 | 'gpoll' : { | 66 | 'gpoll' : { |
69 | diff --git a/meson.build b/meson.build | 67 | diff --git a/meson.build b/meson.build |
70 | index 47f3a5c..7ea7ad1 100644 | 68 | index 813c9b7..6ee775e 100644 |
71 | --- a/meson.build | 69 | --- a/meson.build |
72 | +++ b/meson.build | 70 | +++ b/meson.build |
73 | @@ -32,6 +32,9 @@ else | 71 | @@ -54,6 +54,9 @@ else |
74 | endif | 72 | endif |
75 | 73 | ||
76 | host_system = host_machine.system() | 74 | host_system = host_machine.system() |
@@ -80,16 +78,3 @@ index 47f3a5c..7ea7ad1 100644 | |||
80 | 78 | ||
81 | if host_system == 'darwin' | 79 | if host_system == 'darwin' |
82 | ios_test_code = '''#include <TargetConditionals.h> | 80 | ios_test_code = '''#include <TargetConditionals.h> |
83 | diff --git a/tests/meson.build b/tests/meson.build | ||
84 | index 6741f8f..12fdc90 100644 | ||
85 | --- a/tests/meson.build | ||
86 | +++ b/tests/meson.build | ||
87 | @@ -73,7 +73,7 @@ test_extra_programs = { | ||
88 | 'unicode-collate' : {}, | ||
89 | } | ||
90 | |||
91 | -if host_machine.system() != 'windows' | ||
92 | +if host_system != 'windows' | ||
93 | tests += { | ||
94 | 'timeloop' : {}, | ||
95 | 'iochannel-test' : {}, | ||