summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-04-15 12:54:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-16 11:10:02 +0100
commitc46c419929910e28de9b1d56993b3958bee35457 (patch)
treef6ef445ddf39303fc813592a354e2bb45e371ca6 /meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
parent8a9aaf9e1e311e7172d5551e380481aee4be1bd3 (diff)
downloadpoky-c46c419929910e28de9b1d56993b3958bee35457.tar.gz
meson: update to 0.50.0
Remove 0001-Linker-rules-move-cross_args-in-front-of-output_args.patch as the upstream code has been completely reworked; if the issues pops up again, we need to re-write the fix. Rebase: 0001-Make-CPU-family-warnings-fatal.patch 0001-environment.py-detect-windows-also-if-the-system-str.patch 0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch 0002-Support-building-allarch-recipes-again.patch Add 0001-mesonbuild-environment.py-check-environment-for-vari.patch as particularly we set windows resource compiler through an environment variable WINDRES. This has replaced the 0001-modules-windows-split-WINDRES-env-variable.patch as the code has been refactored. Add 0001-mesonbuild-environment.py-do-not-determine-whether-a.patch for a more robust detection of cross builds. Replace many-cross.patch with corresponding backports from upcoming 0.50.1: 0007-mesonbuild-allow-multiple-cross-file-options.patch load-configs-generalise-search-path.patch Drop cross-libdir.patch as it has been merged upstream. (From OE-Core rev: 3f9a0f0c6c99364eb128ffc2db704e957f1c0bce) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch')
-rw-r--r--meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch30
1 files changed, 30 insertions, 0 deletions
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
new file mode 100644
index 0000000000..e64e13b836
--- /dev/null
+++ b/meta/recipes-devtools/meson/meson/0001-mesonbuild-environment.py-do-not-determine-whether-a.patch
@@ -0,0 +1,30 @@
1From c040f0dbace3259c80f3710bc019433b9c817940 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 mesonbuild/environment.py | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
16index 4c1c5ac..6e5d689 100644
17--- a/mesonbuild/environment.py
18+++ b/mesonbuild/environment.py
19@@ -478,7 +478,7 @@ class Environment:
20 self.first_invocation = True
21
22 def is_cross_build(self):
23- return not self.machines.matches_build_machine(MachineChoice.HOST)
24+ return self.need_exe_wrapper()
25
26 def dump_coredata(self):
27 return coredata.save(self.coredata, self.get_build_dir())
28--
292.17.1
30