From ee32c312d01f4abfca2d2587d7a3a7e0115f779c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 18 Feb 2019 13:41:02 +0100 Subject: meson: add a couple of patches to help with mingw builds Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson.inc | 2 ++ ...odules-windows-split-WINDRES-env-variable.patch | 26 ++++++++++++++++++++++ ....py-detect-windows-also-if-the-system-str.patch | 25 +++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch create mode 100644 meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch (limited to 'meta') diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc index d37afc3b0d..c39b1a3d5e 100644 --- a/meta/recipes-devtools/meson/meson.inc +++ b/meta/recipes-devtools/meson/meson.inc @@ -12,6 +12,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-python-module-do-not-manipulate-the-environment-when.patch \ file://disable-rpath-handling.patch \ file://cross-libdir.patch \ + file://0001-modules-windows-split-WINDRES-env-variable.patch \ + file://0002-environment.py-detect-windows-also-if-the-system-str.patch \ " SRC_URI[sha256sum] = "fb0395c4ac208eab381cd1a20571584bdbba176eb562a7efa9cb17cace0e1551" SRC_URI[md5sum] = "3c35b91e8040901034809576d54007c6" diff --git a/meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch b/meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch new file mode 100644 index 0000000000..c334e6dd66 --- /dev/null +++ b/meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch @@ -0,0 +1,26 @@ +From 5293d0f5067b2aeefe9ce3c175c972de367589bc Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 13 Feb 2019 17:43:54 +0100 +Subject: [PATCH] modules/windows: split WINDRES env variable + +As it may contain not just the binary, but also the arguments to it. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + mesonbuild/modules/windows.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py +index d185d89..dbaeb9b 100644 +--- a/mesonbuild/modules/windows.py ++++ b/mesonbuild/modules/windows.py +@@ -56,7 +56,7 @@ class WindowsModule(ExtensionModule): + if 'WINDRES' in os.environ: + # Pick-up env var WINDRES if set. This is often used for + # specifying an arch-specific windres. +- rescomp = ExternalProgram('windres', command=os.environ.get('WINDRES'), silent=True) ++ rescomp = ExternalProgram('windres', command=os.environ.get('WINDRES').split(), silent=True) + + if not rescomp or not rescomp.found(): + # Take windres from the config file after the environment, which is diff --git a/meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch b/meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch new file mode 100644 index 0000000000..1be5d66329 --- /dev/null +++ b/meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch @@ -0,0 +1,25 @@ +From 7bf4c2c02eb7fe1bf24b23e3ba2d7df36495e0aa Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 13 Feb 2019 17:45:09 +0100 +Subject: [PATCH] environment.py: detect windows also if the system string + contains 'mingw' + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + mesonbuild/environment.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py +index b4fc0dc..845077e 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -1247,7 +1247,7 @@ class MachineInfo: + """ + Machine is windows? + """ +- return self.system == 'windows' ++ return self.system == 'windows' or 'mingw' in self.system + + def is_cygwin(self): + """ -- cgit 1.2.3-korg