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 @@ -From 9681c5bdea6a67abf014d94a392ef42eea7df0cd Mon Sep 17 00:00:00 2001 +From 2e8553fc01e62ebc4faa240bf20984a8a0ac7387 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Tue, 3 Jul 2018 13:59:09 +0100 -Subject: [PATCH 2/3] Make CPU family warnings fatal +Subject: [PATCH] Make CPU family warnings fatal Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton <ross.burton@intel.com> + --- - mesonbuild/environment.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + mesonbuild/environment.py | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 678d009..8b32892 100644 +index d29a77f..267acf9 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -228,7 +228,7 @@ def detect_cpu_family(compilers): - # Add fixes here as bugs are reported. +@@ -239,9 +239,7 @@ def detect_cpu_family(compilers): + return 'x86_64' if trial not in known_cpu_families: -- mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) +- mlog.warning('Unknown CPU family {!r}, please report this at ' +- 'https://github.com/mesonbuild/meson/issues/new with the' +- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) + raise EnvironmentException('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % trial) return trial -@@ -1043,7 +1043,7 @@ class CrossBuildInfo: +@@ -1014,7 +1012,7 @@ class CrossBuildInfo: raise EnvironmentException('Malformed value in cross file variable %s.' % entry) if entry == 'cpu_family' and res not in known_cpu_families: @@ -31,6 +34,3 @@ index 678d009..8b32892 100644 if self.ok_type(res): self.config[s][entry] = res --- -2.12.0 - |