diff options
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.patch | 32 |
1 files changed, 18 insertions, 14 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 0808891a27..8ea7c35950 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 @@ | |||
1 | From 76934bcbf2cfa7304e8864e28c51f58adda0392f Mon Sep 17 00:00:00 2001 | 1 | From b77cbe67df5fa0998946503f207c256ee740bb5f Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 | 3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 |
4 | Subject: [PATCH] Make CPU family warnings fatal | 4 | Subject: [PATCH] Make CPU family warnings fatal |
@@ -7,34 +7,38 @@ Upstream-Status: Inappropriate [OE specific] | |||
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
8 | 8 | ||
9 | --- | 9 | --- |
10 | mesonbuild/envconfig.py | 2 +- | 10 | mesonbuild/envconfig.py | 4 ++-- |
11 | mesonbuild/environment.py | 4 +--- | 11 | mesonbuild/environment.py | 6 ++---- |
12 | 2 files changed, 2 insertions(+), 4 deletions(-) | 12 | 2 files changed, 4 insertions(+), 6 deletions(-) |
13 | 13 | ||
14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py | 14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py |
15 | index ba35d16..2d3c34c 100644 | 15 | index 07f1229..a35c356 100644 |
16 | --- a/mesonbuild/envconfig.py | 16 | --- a/mesonbuild/envconfig.py |
17 | +++ b/mesonbuild/envconfig.py | 17 | +++ b/mesonbuild/envconfig.py |
18 | @@ -262,7 +262,7 @@ class MachineInfo: | 18 | @@ -285,8 +285,8 @@ class MachineInfo(HoldableObject): |
19 | 'but is missing {}.'.format(minimum_literal - set(literal))) | ||
19 | 20 | ||
20 | cpu_family = literal['cpu_family'] | 21 | cpu_family = literal['cpu_family'] |
21 | if cpu_family not in known_cpu_families: | 22 | - if cpu_family not in known_cpu_families: |
22 | - mlog.warning('Unknown CPU family {}, please report this at https://github.com/mesonbuild/meson/issues/new'.format(cpu_family)) | 23 | - mlog.warning(f'Unknown CPU family {cpu_family}, please report this at https://github.com/mesonbuild/meson/issues/new') |
24 | + if cpu_family not in known_cpu_families and cpu_family != "riscv": | ||
23 | + raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family)) | 25 | + raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family)) |
24 | 26 | ||
25 | endian = literal['endian'] | 27 | endian = literal['endian'] |
26 | if endian not in ('little', 'big'): | 28 | if endian not in ('little', 'big'): |
27 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | 29 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
28 | index 756dd81..4d2c2b6 100644 | 30 | index 2ba2054..d798e3b 100644 |
29 | --- a/mesonbuild/environment.py | 31 | --- a/mesonbuild/environment.py |
30 | +++ b/mesonbuild/environment.py | 32 | +++ b/mesonbuild/environment.py |
31 | @@ -434,9 +434,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: | 33 | @@ -359,10 +359,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: |
32 | trial = 'ppc64' | 34 | if compilers and not any_compiler_has_define(compilers, '__mips64'): |
35 | trial = 'mips' | ||
33 | 36 | ||
34 | if trial not in known_cpu_families: | 37 | - if trial not in known_cpu_families: |
35 | - mlog.warning('Unknown CPU family {!r}, please report this at ' | 38 | - mlog.warning(f'Unknown CPU family {trial!r}, please report this at ' |
36 | - 'https://github.com/mesonbuild/meson/issues/new with the ' | 39 | - 'https://github.com/mesonbuild/meson/issues/new with the ' |
37 | - 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) | 40 | - 'output of `uname -a` and `cat /proc/cpuinfo`') |
41 | + if trial not in known_cpu_families and trail != "riscv": | ||
38 | + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) | 42 | + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) |
39 | 43 | ||
40 | return trial | 44 | return trial |