diff --git a/recipes-devtools/meson/files/0001-Make-CPU-family-warnings-fatal.patch b/recipes-devtools/meson/files/0001-Make-CPU-family-warnings-fatal.patch deleted file mode 100644 index c35c04c..0000000 --- a/recipes-devtools/meson/files/0001-Make-CPU-family-warnings-fatal.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6c4eef1d92e9e42fdbc888365cab3c95fb33c605 Mon Sep 17 00:00:00 2001 -From: Ross Burton -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 - ---- - mesonbuild/envconfig.py | 2 +- - mesonbuild/environment.py | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 307aac3..66fb7ec 100644 ---- a/mesonbuild/envconfig.py -+++ b/mesonbuild/envconfig.py -@@ -267,7 +267,7 @@ class MachineInfo(HoldableObject): - - 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') -+ 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'): -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 71286a5..179917e 100644 ---- a/mesonbuild/environment.py -+++ b/mesonbuild/environment.py -@@ -352,9 +352,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: - 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`') -+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) - - return trial - - diff --git a/recipes-devtools/meson/meson_%.bbappend b/recipes-devtools/meson/meson_%.bbappend deleted file mode 100644 index 95096d1..0000000 --- a/recipes-devtools/meson/meson_%.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -SRC_URI:remove = " file://0003-native_bindir.patch \" -SRC_URI:remove = " file://gi-target-dep.patch \" - -PV = "0.59.0" -SRC_URI[sha256sum] = "e376c298df64b643dfe01eccb2d7b6f1e02e95aa38c19f19d120d129612ce476" - -