diff options
Diffstat (limited to 'meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch')
-rw-r--r-- | meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch index 3b377351a2..a6c1b25c46 100644 --- a/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0002-Make-CPU-family-warnings-fatal.patch | |||
@@ -1,28 +1,31 @@ | |||
1 | From 9681c5bdea6a67abf014d94a392ef42eea7df0cd Mon Sep 17 00:00:00 2001 | 1 | From 2e8553fc01e62ebc4faa240bf20984a8a0ac7387 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 2/3] Make CPU family warnings fatal | 4 | Subject: [PATCH] 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> |
8 | |||
8 | --- | 9 | --- |
9 | mesonbuild/environment.py | 4 ++-- | 10 | mesonbuild/environment.py | 6 ++---- |
10 | 1 file changed, 2 insertions(+), 2 deletions(-) | 11 | 1 file changed, 2 insertions(+), 4 deletions(-) |
11 | 12 | ||
12 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py | 13 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
13 | index 678d009..8b32892 100644 | 14 | index d29a77f..267acf9 100644 |
14 | --- a/mesonbuild/environment.py | 15 | --- a/mesonbuild/environment.py |
15 | +++ b/mesonbuild/environment.py | 16 | +++ b/mesonbuild/environment.py |
16 | @@ -228,7 +228,7 @@ def detect_cpu_family(compilers): | 17 | @@ -239,9 +239,7 @@ def detect_cpu_family(compilers): |
17 | # Add fixes here as bugs are reported. | 18 | return 'x86_64' |
18 | 19 | ||
19 | if trial not in known_cpu_families: | 20 | if trial not in known_cpu_families: |
20 | - mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) | 21 | - mlog.warning('Unknown CPU family {!r}, please report this at ' |
22 | - 'https://github.com/mesonbuild/meson/issues/new with the' | ||
23 | - 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) | ||
21 | + raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) | 24 | + raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) |
22 | 25 | ||
23 | return trial | 26 | return trial |
24 | 27 | ||
25 | @@ -1043,7 +1043,7 @@ class CrossBuildInfo: | 28 | @@ -1014,7 +1012,7 @@ class CrossBuildInfo: |
26 | raise EnvironmentException('Malformed value in cross file variable %s.' % entry) | 29 | raise EnvironmentException('Malformed value in cross file variable %s.' % entry) |
27 | 30 | ||
28 | if entry == 'cpu_family' and res not in known_cpu_families: | 31 | if entry == 'cpu_family' and res not in known_cpu_families: |
@@ -31,6 +34,3 @@ index 678d009..8b32892 100644 | |||
31 | 34 | ||
32 | if self.ok_type(res): | 35 | if self.ok_type(res): |
33 | self.config[s][entry] = res | 36 | self.config[s][entry] = res |
34 | -- | ||
35 | 2.12.0 | ||
36 | |||