46 lines
2.1 KiB
Diff
46 lines
2.1 KiB
Diff
From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 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] Make CPU family warnings fatal
|
|
|
|
Upstream-Status: Inappropriate [OE specific]
|
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
|
|
---
|
|
mesonbuild/envconfig.py | 2 +-
|
|
mesonbuild/environment.py | 4 +---
|
|
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
Index: meson-0.60.2/mesonbuild/envconfig.py
|
|
===================================================================
|
|
--- meson-0.60.2.orig/mesonbuild/envconfig.py
|
|
+++ meson-0.60.2/mesonbuild/envconfig.py
|
|
@@ -266,8 +266,8 @@ class MachineInfo(HoldableObject):
|
|
'but is missing {}.'.format(minimum_literal - set(literal)))
|
|
|
|
cpu_family = literal['cpu_family']
|
|
- if cpu_family not in known_cpu_families:
|
|
- mlog.warning(f'Unknown CPU family {cpu_family}, please report this at https://github.com/mesonbuild/meson/issues/new')
|
|
+ if cpu_family not in known_cpu_families and cpu_family != "riscv":
|
|
+ raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))
|
|
|
|
endian = literal['endian']
|
|
if endian not in ('little', 'big'):
|
|
Index: meson-0.60.2/mesonbuild/environment.py
|
|
===================================================================
|
|
--- meson-0.60.2.orig/mesonbuild/environment.py
|
|
+++ meson-0.60.2/mesonbuild/environment.py
|
|
@@ -354,10 +354,8 @@ def detect_cpu_family(compilers: Compile
|
|
if any_compiler_has_define(compilers, '__64BIT__'):
|
|
trial = 'ppc64'
|
|
|
|
- if trial not in known_cpu_families:
|
|
- mlog.warning(f'Unknown CPU family {trial!r}, please report this at '
|
|
- 'https://github.com/mesonbuild/meson/issues/new with the '
|
|
- 'output of `uname -a` and `cat /proc/cpuinfo`')
|
|
+ if trial not in known_cpu_families and trail != "riscv":
|
|
+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
|
|
|
|
return trial
|
|
|