mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 21:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

meson: add a couple of patches to help with mingw builds

Browse Source 
(From OE-Core rev: ee32c312d01f4abfca2d2587d7a3a7e0115f779c)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2019-02-18 13:41:02 +01:00
committed by Richard Purdie
parent 85a4d9f53b
commit 3b988a1ed2
3 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-devtools/meson/meson.inc
View File

@@ -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"

26
meta/recipes-devtools/meson/meson/0001-modules-windows-split-WINDRES-env-variable.patch Normal file
View File

@@ -0,0 +1,26 @@
From 5293d0f5067b2aeefe9ce3c175c972de367589bc Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
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 <alex.kanavin@gmail.com>
---
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

25
meta/recipes-devtools/meson/meson/0002-environment.py-detect-windows-also-if-the-system-str.patch Normal file
View File

@@ -0,0 +1,25 @@
From 7bf4c2c02eb7fe1bf24b23e3ba2d7df36495e0aa Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
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 <alex.kanavin@gmail.com>
---
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):
"""