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 | 19 |
1 files changed, 11 insertions, 8 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 1be94a9b19..ceb2fde342 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,7 +1,7 @@ | |||
1 | From 62c415eedb62905de76e2e0bbd156a947705cab2 Mon Sep 17 00:00:00 2001 | 1 | From 5624b5835af747b601780ad14646f9c1fb854931 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 1/2] Make CPU family warnings fatal |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [OE specific] | 6 | 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> |
@@ -12,23 +12,23 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
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 | diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py |
15 | index 17058df..18bbf86 100644 | 15 | index 219b62e..d1be65b 100644 |
16 | --- a/mesonbuild/envconfig.py | 16 | --- a/mesonbuild/envconfig.py |
17 | +++ b/mesonbuild/envconfig.py | 17 | +++ b/mesonbuild/envconfig.py |
18 | @@ -225,7 +225,7 @@ class MachineInfo: | 18 | @@ -199,7 +199,7 @@ class MachineInfo: |
19 | 19 | ||
20 | cpu_family = literal['cpu_family'] | 20 | cpu_family = literal['cpu_family'] |
21 | if cpu_family not in known_cpu_families: | 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) | 22 | - mlog.warning('Unknown CPU family {}, please report this at https://github.com/mesonbuild/meson/issues/new'.format(cpu_family)) |
23 | + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % cpu_family) | 23 | + raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family)) |
24 | 24 | ||
25 | endian = literal['endian'] | 25 | endian = literal['endian'] |
26 | if endian not in ('little', 'big'): | 26 | if endian not in ('little', 'big'): |
27 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | 27 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
28 | index a2f78a4..59fcb07 100644 | 28 | index bf09a88..8eabe78 100644 |
29 | --- a/mesonbuild/environment.py | 29 | --- a/mesonbuild/environment.py |
30 | +++ b/mesonbuild/environment.py | 30 | +++ b/mesonbuild/environment.py |
31 | @@ -364,9 +364,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: | 31 | @@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: |
32 | trial = 'parisc' | 32 | trial = 'parisc' |
33 | 33 | ||
34 | if trial not in known_cpu_families: | 34 | if trial not in known_cpu_families: |
@@ -39,3 +39,6 @@ index a2f78a4..59fcb07 100644 | |||
39 | 39 | ||
40 | return trial | 40 | return trial |
41 | 41 | ||
42 | -- | ||
43 | 2.24.0 | ||
44 | |||