summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.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-Make-CPU-family-warnings-fatal.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-Make-CPU-family-warnings-fatal.patch')
-rw-r--r--meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch35
1 files changed, 20 insertions, 15 deletions
diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
index fbc3f5ad82..2580b1e366 100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
@@ -1,4 +1,4 @@
1From 2db829d865bb6464ac15dbb4a58c9a675e296866 Mon Sep 17 00:00:00 2001 1From f76d2bf09f7ffd871d068c4ac4c4be083f5fb07f Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 3 Jul 2018 13:59:09 +0100 3Date: Tue, 3 Jul 2018 13:59:09 +0100
4Subject: [PATCH] Make CPU family warnings fatal 4Subject: [PATCH] Make CPU family warnings fatal
@@ -7,15 +7,29 @@ Upstream-Status: Inappropriate [OE specific]
7Signed-off-by: Ross Burton <ross.burton@intel.com> 7Signed-off-by: Ross Burton <ross.burton@intel.com>
8 8
9--- 9---
10 mesonbuild/environment.py | 6 ++---- 10 mesonbuild/envconfig.py | 2 +-
11 1 file changed, 2 insertions(+), 4 deletions(-) 11 mesonbuild/environment.py | 4 +---
12 2 files changed, 2 insertions(+), 4 deletions(-)
12 13
14diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
15index f2510c1..b9841fe 100644
16--- a/mesonbuild/envconfig.py
17+++ b/mesonbuild/envconfig.py
18@@ -178,7 +178,7 @@ class MachineInfo:
19
20 cpu_family = literal['cpu_family']
21 if cpu_family not in known_cpu_families:
22- mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % cpu_family)
23+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family)
24
25 endian = literal['endian']
26 if endian not in ('little', 'big'):
13diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py 27diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
14index 2ccd31e..5fcf9df 100644 28index 4c1c5ac..a5a7461 100644
15--- a/mesonbuild/environment.py 29--- a/mesonbuild/environment.py
16+++ b/mesonbuild/environment.py 30+++ b/mesonbuild/environment.py
17@@ -265,9 +265,7 @@ def detect_cpu_family(compilers): 31@@ -242,9 +242,7 @@ def detect_cpu_family(compilers):
18 # below. 32 trial = 'parisc'
19 33
20 if trial not in known_cpu_families: 34 if trial not in known_cpu_families:
21- mlog.warning('Unknown CPU family {!r}, please report this at ' 35- mlog.warning('Unknown CPU family {!r}, please report this at '
@@ -25,12 +39,3 @@ index 2ccd31e..5fcf9df 100644
25 39
26 return trial 40 return trial
27 41
28@@ -1232,7 +1230,7 @@ class MachineInfo:
29
30 cpu_family = literal['cpu_family']
31 if cpu_family not in known_cpu_families:
32- mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % cpu_family)
33+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family)
34
35 endian = literal['endian']
36 if endian not in ('little', 'big'):