blob: d22a646c5de027021dd1e9a2c372c9c1c24e631d [file] [log] [blame]
Brad Bishop15ae2502019-06-18 21:44:24 -04001From f5a4b4c0579734923c9caf70944322efff57318b Mon Sep 17 00:00:00 2001
Brad Bishop19323692019-04-05 15:28:33 -04002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 13 Feb 2019 15:32:05 +0100
4Subject: [PATCH] Set host_machine correctly when building with mingw32
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
9---
10 gio/tests/meson.build | 8 ++++----
Brad Bishop15ae2502019-06-18 21:44:24 -040011 glib/tests/meson.build | 2 +-
Brad Bishop19323692019-04-05 15:28:33 -040012 meson.build | 3 +++
13 tests/meson.build | 2 +-
Brad Bishop15ae2502019-06-18 21:44:24 -040014 4 files changed, 9 insertions(+), 6 deletions(-)
Brad Bishop19323692019-04-05 15:28:33 -040015
16diff --git a/gio/tests/meson.build b/gio/tests/meson.build
Brad Bishop15ae2502019-06-18 21:44:24 -040017index 028b196..217ccb1 100644
Brad Bishop19323692019-04-05 15:28:33 -040018--- 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
Brad Bishop15ae2502019-06-18 21:44:24 -040029@@ -119,7 +119,7 @@ if dbus1_dep.found()
Brad Bishop19323692019-04-05 15:28:33 -040030 endif
31
32 # Test programs buildable on UNIX only
33-if host_machine.system() != 'windows'
34+if host_system != 'windows'
Brad Bishop15ae2502019-06-18 21:44:24 -040035 gio_tests += {
Brad Bishop19323692019-04-05 15:28:33 -040036 'file' : {},
37 'gdbus-peer' : {
Brad Bishop15ae2502019-06-18 21:44:24 -040038@@ -327,7 +327,7 @@ if host_machine.system() != 'windows'
Brad Bishop19323692019-04-05 15:28:33 -040039 endif # unix
40
41 # Test programs buildable on Windows only
42-if host_machine.system() == 'windows'
43+if host_system == 'windows'
Brad Bishop15ae2502019-06-18 21:44:24 -040044 gio_tests += {'win32-streams' : {}}
Brad Bishop19323692019-04-05 15:28:33 -040045 endif
46
Brad Bishop15ae2502019-06-18 21:44:24 -040047@@ -392,7 +392,7 @@ if cc.get_id() != 'msvc'
48 }
Brad Bishop19323692019-04-05 15:28:33 -040049 endif
50
51-if host_machine.system() != 'windows'
52+if host_system != 'windows'
Brad Bishop15ae2502019-06-18 21:44:24 -040053 test_extra_programs += {
Brad Bishop19323692019-04-05 15:28:33 -040054 'gdbus-example-unix-fd-client' : {
55 'install' : false,
56diff --git a/glib/tests/meson.build b/glib/tests/meson.build
Brad Bishop15ae2502019-06-18 21:44:24 -040057index d54fc41..a4761fe 100644
Brad Bishop19323692019-04-05 15:28:33 -040058--- a/glib/tests/meson.build
59+++ b/glib/tests/meson.build
Brad Bishop15ae2502019-06-18 21:44:24 -040060@@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
61 }
62 endif
63
64-if host_machine.system() == 'windows'
65+if host_system == 'windows'
66 if winsock2.found()
67 glib_tests += {
68 'gpoll' : {
Brad Bishop19323692019-04-05 15:28:33 -040069diff --git a/meson.build b/meson.build
Brad Bishop15ae2502019-06-18 21:44:24 -040070index a745024..e87eae5 100644
Brad Bishop19323692019-04-05 15:28:33 -040071--- a/meson.build
72+++ b/meson.build
73@@ -31,6 +31,9 @@ else
74 endif
75
76 host_system = host_machine.system()
77+if host_system == 'mingw32'
78+ host_system = 'windows'
79+endif
80
81 glib_version = meson.project_version()
82 glib_api_version = '2.0'
83diff --git a/tests/meson.build b/tests/meson.build
Brad Bishop15ae2502019-06-18 21:44:24 -040084index 11075dd..cd6067b 100644
Brad Bishop19323692019-04-05 15:28:33 -040085--- a/tests/meson.build
86+++ b/tests/meson.build
Brad Bishop15ae2502019-06-18 21:44:24 -040087@@ -66,7 +66,7 @@ test_extra_programs = {
Brad Bishop19323692019-04-05 15:28:33 -040088 'unicode-collate' : {},
89 }
90
91-if host_machine.system() != 'windows'
92+if host_system != 'windows'
Brad Bishop15ae2502019-06-18 21:44:24 -040093 tests += {
Brad Bishop19323692019-04-05 15:28:33 -040094 'timeloop' : {},
Brad Bishop15ae2502019-06-18 21:44:24 -040095 'iochannel-test' : {},