summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/meson')
-rw-r--r--meta/recipes-devtools/meson/meson.inc2
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch28
-rw-r--r--meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch28
3 files changed, 29 insertions, 29 deletions
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index d365bcd8a3..8219d87c74 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -15,7 +15,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
15 file://disable-rpath-handling.patch \ 15 file://disable-rpath-handling.patch \
16 file://cross-prop-default.patch \ 16 file://cross-prop-default.patch \
17 file://0001-environment.py-detect-windows-also-if-the-system-str.patch \ 17 file://0001-environment.py-detect-windows-also-if-the-system-str.patch \
18 file://0001-mesonbuild-environment.py-do-not-determine-whether-a.patch \ 18 file://0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch \
19 file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ 19 file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
20 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ 20 file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
21 file://vala-cross-compile.patch \ 21 file://vala-cross-compile.patch \
diff --git a/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch b/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch
new file mode 100644
index 0000000000..a5dbb81b08
--- /dev/null
+++ b/meta/recipes-devtools/meson/meson/0001-Cross-build-is-defined-by-the-existance-of-a-cross-f.patch
@@ -0,0 +1,28 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 0b4d1e8afd5428a495f8624ee061f63977b4c268 Mon Sep 17 00:00:00 2001
5From: Jussi Pakkanen <jpakkane@gmail.com>
6Date: Sun, 6 Oct 2019 15:17:32 +0300
7Subject: [PATCH] Cross build is defined by the existance of a cross file.
8
9---
10 mesonbuild/environment.py | 2 +-
11 2 files changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
14index e5d041b4..03c65688 100644
15--- a/mesonbuild/environment.py
16+++ b/mesonbuild/environment.py
17@@ -611,7 +611,7 @@ class Environment:
18 self.first_invocation = True
19
20 def is_cross_build(self) -> bool:
21- return not self.machines.matches_build_machine(MachineChoice.HOST)
22+ return self.coredata.is_cross_build()
23
24 def dump_coredata(self):
25 return coredata.save(self.coredata, self.get_build_dir())
26--
272.20.1
28
diff --git a/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch b/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
deleted file mode 100644
index 8cb11879f4..0000000000
--- a/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From ec9c4a22424a5d55fcf213a55d03f096ec24bcae Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 25 Mar 2019 18:18:33 +0100
4Subject: [PATCH] mesonbuild/environment.py: do not determine whether a build
5 is cross by comparing architectures
6
7This can, and does, go wrong when our host architecture is same as the target one(e.g. x86_64).
8
9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
12---
13 mesonbuild/environment.py | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
17index 84a7596..9a029f4 100644
18--- a/mesonbuild/environment.py
19+++ b/mesonbuild/environment.py
20@@ -520,7 +520,7 @@ class Environment:
21 self.first_invocation = True
22
23 def is_cross_build(self) -> bool:
24- return not self.machines.matches_build_machine(MachineChoice.HOST)
25+ return self.need_exe_wrapper()
26
27 def dump_coredata(self):
28 return coredata.save(self.coredata, self.get_build_dir())