blob: 848dccfbe72cf9bfc3b6ff193e884a257960385b [file] [log] [blame]
Andrew Geisslereff27472021-10-29 15:35:00 -05001From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 2001
Brad Bishop19323692019-04-05 15:28:33 -04002From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 3 Jul 2018 13:59:09 +0100
Andrew Geisslereff27472021-10-29 15:35:00 -05004Subject: [PATCH] Make CPU family warnings fatal
Brad Bishop19323692019-04-05 15:28:33 -04005
6Upstream-Status: Inappropriate [OE specific]
7Signed-off-by: Ross Burton <ross.burton@intel.com>
Andrew Geisslereff27472021-10-29 15:35:00 -05008
Brad Bishop19323692019-04-05 15:28:33 -04009---
Brad Bishopc342db32019-05-15 21:57:59 -040010 mesonbuild/envconfig.py | 2 +-
11 mesonbuild/environment.py | 4 +---
12 2 files changed, 2 insertions(+), 4 deletions(-)
Brad Bishop19323692019-04-05 15:28:33 -040013
Andrew Geissler595f6302022-01-24 19:11:47 +000014Index: meson-0.60.2/mesonbuild/envconfig.py
15===================================================================
16--- meson-0.60.2.orig/mesonbuild/envconfig.py
17+++ meson-0.60.2/mesonbuild/envconfig.py
18@@ -266,8 +266,8 @@ class MachineInfo(HoldableObject):
19 'but is missing {}.'.format(minimum_literal - set(literal)))
William A. Kennington IIIac69b482021-06-02 12:28:27 -070020
Brad Bishopc342db32019-05-15 21:57:59 -040021 cpu_family = literal['cpu_family']
Andrew Geissler595f6302022-01-24 19:11:47 +000022- if cpu_family not in known_cpu_families:
William A. Kennington IIIac69b482021-06-02 12:28:27 -070023- mlog.warning(f'Unknown CPU family {cpu_family}, please report this at https://github.com/mesonbuild/meson/issues/new')
Andrew Geissler595f6302022-01-24 19:11:47 +000024+ if cpu_family not in known_cpu_families and cpu_family != "riscv":
Andrew Geissler635e0e42020-08-21 15:58:33 -050025+ raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))
William A. Kennington IIIac69b482021-06-02 12:28:27 -070026
Brad Bishopc342db32019-05-15 21:57:59 -040027 endian = literal['endian']
28 if endian not in ('little', 'big'):
Andrew Geissler595f6302022-01-24 19:11:47 +000029Index: meson-0.60.2/mesonbuild/environment.py
30===================================================================
31--- meson-0.60.2.orig/mesonbuild/environment.py
32+++ meson-0.60.2/mesonbuild/environment.py
33@@ -354,10 +354,8 @@ def detect_cpu_family(compilers: Compile
34 if any_compiler_has_define(compilers, '__64BIT__'):
Andrew Geissler09209ee2020-12-13 08:44:15 -060035 trial = 'ppc64'
William A. Kennington IIIac69b482021-06-02 12:28:27 -070036
Andrew Geissler595f6302022-01-24 19:11:47 +000037- if trial not in known_cpu_families:
Andrew Geisslereff27472021-10-29 15:35:00 -050038- mlog.warning(f'Unknown CPU family {trial!r}, please report this at '
William A. Kennington IIIc5966302020-03-20 13:04:31 -070039- 'https://github.com/mesonbuild/meson/issues/new with the '
Andrew Geisslereff27472021-10-29 15:35:00 -050040- 'output of `uname -a` and `cat /proc/cpuinfo`')
Andrew Geissler595f6302022-01-24 19:11:47 +000041+ if trial not in known_cpu_families and trail != "riscv":
Brad Bishop19323692019-04-05 15:28:33 -040042+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
William A. Kennington IIIac69b482021-06-02 12:28:27 -070043
Brad Bishop19323692019-04-05 15:28:33 -040044 return trial
William A. Kennington IIIac69b482021-06-02 12:28:27 -070045