Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 1 | From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 2 | From: Ross Burton <ross.burton@intel.com> |
| 3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 4 | Subject: [PATCH] Make CPU family warnings fatal |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Inappropriate [OE specific] |
| 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 8 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 9 | --- |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 10 | mesonbuild/envconfig.py | 2 +- |
| 11 | mesonbuild/environment.py | 4 +--- |
| 12 | 2 files changed, 2 insertions(+), 4 deletions(-) |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 13 | |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 14 | Index: 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 III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 20 | |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 21 | cpu_family = literal['cpu_family'] |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 22 | - if cpu_family not in known_cpu_families: |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 23 | - mlog.warning(f'Unknown CPU family {cpu_family}, please report this at https://github.com/mesonbuild/meson/issues/new') |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 24 | + if cpu_family not in known_cpu_families and cpu_family != "riscv": |
Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 25 | + raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family)) |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 26 | |
Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 27 | endian = literal['endian'] |
| 28 | if endian not in ('little', 'big'): |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 29 | Index: 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 Geissler | 09209ee | 2020-12-13 08:44:15 -0600 | [diff] [blame] | 35 | trial = 'ppc64' |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 36 | |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 37 | - if trial not in known_cpu_families: |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 38 | - mlog.warning(f'Unknown CPU family {trial!r}, please report this at ' |
William A. Kennington III | c596630 | 2020-03-20 13:04:31 -0700 | [diff] [blame] | 39 | - 'https://github.com/mesonbuild/meson/issues/new with the ' |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 40 | - 'output of `uname -a` and `cat /proc/cpuinfo`') |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 41 | + if trial not in known_cpu_families and trail != "riscv": |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 42 | + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 43 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 44 | return trial |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 45 | |