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 | 28 |
1 files changed, 16 insertions, 12 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 c5be526b10..848dccfbe7 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 | |||
@@ -11,30 +11,34 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
11 | mesonbuild/environment.py | 4 +--- | 11 | mesonbuild/environment.py | 4 +--- |
12 | 2 files changed, 2 insertions(+), 4 deletions(-) | 12 | 2 files changed, 2 insertions(+), 4 deletions(-) |
13 | 13 | ||
14 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py | 14 | Index: meson-0.60.2/mesonbuild/envconfig.py |
15 | index 307aac3..66fb7ec 100644 | 15 | =================================================================== |
16 | --- a/mesonbuild/envconfig.py | 16 | --- meson-0.60.2.orig/mesonbuild/envconfig.py |
17 | +++ b/mesonbuild/envconfig.py | 17 | +++ meson-0.60.2/mesonbuild/envconfig.py |
18 | @@ -267,7 +267,7 @@ class MachineInfo(HoldableObject): | 18 | @@ -266,8 +266,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(f'Unknown CPU family {cpu_family}, please report this at https://github.com/mesonbuild/meson/issues/new') | 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 | Index: meson-0.60.2/mesonbuild/environment.py |
28 | index 71286a5..179917e 100644 | 30 | =================================================================== |
29 | --- a/mesonbuild/environment.py | 31 | --- meson-0.60.2.orig/mesonbuild/environment.py |
30 | +++ b/mesonbuild/environment.py | 32 | +++ meson-0.60.2/mesonbuild/environment.py |
31 | @@ -352,9 +352,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: | 33 | @@ -354,10 +354,8 @@ def detect_cpu_family(compilers: Compile |
34 | if any_compiler_has_define(compilers, '__64BIT__'): | ||
32 | trial = 'ppc64' | 35 | trial = 'ppc64' |
33 | 36 | ||
34 | if trial not in known_cpu_families: | 37 | - if trial not in known_cpu_families: |
35 | - mlog.warning(f'Unknown CPU family {trial!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`') | 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 |