| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 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' : {}, |