diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index c2dc3fffcf..e8c4dc31bb 100644 --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From 9854e557b77612afb095e9868bb7cba12bc1b1cb Mon Sep 17 00:00:00 2001 +From 593f5362a4464ec4266f13c1c57fc8324da5606b 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 @@ -6,15 +6,14 @@ Subject: [PATCH] Make CPU family warnings fatal Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ross Burton --- - mesonbuild/envconfig.py | 4 ++-- - mesonbuild/environment.py | 6 ++---- - 2 files changed, 4 insertions(+), 6 deletions(-) + mesonbuild/envconfig.py | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 43fad0c..27be871 100644 +index 7e19505..3dc9766 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -287,8 +287,8 @@ class MachineInfo(HoldableObject): +@@ -294,8 +294,8 @@ class MachineInfo(HoldableObject): 'but is missing {}.'.format(minimum_literal - set(literal))) cpu_family = literal['cpu_family'] @@ -25,11 +24,7 @@ index 43fad0c..27be871 100644 endian = literal['endian'] if endian not in ('little', 'big'): -diff --git i/mesonbuild/envconfig.py w/mesonbuild/envconfig.py -index dd050b011..5277693c3 100644 ---- i/mesonbuild/envconfig.py -+++ w/mesonbuild/envconfig.py -@@ -634,9 +634,7 @@ def detect_cpu_family(compilers: T.Dict[str, Compiler]) -> str: +@@ -642,9 +642,7 @@ def detect_cpu_family(compilers: CompilerDict) -> str: trial = 'mips' if trial not in known_cpu_families: diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index 2e294b5b7f..bebfcd3d29 100644 --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From fac479734d7f6e04eba71c8193623465d9eb0228 Mon Sep 17 00:00:00 2001 +From 0d148a962bb5b858384eff4fd492f468b7c0bbee Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again @@ -12,10 +12,10 @@ Signed-off-by: Peter Kjellerstedt 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 27be871..994ac77 100644 +index 3dc9766..212a5e8 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -31,6 +31,7 @@ if T.TYPE_CHECKING: +@@ -37,6 +37,7 @@ if T.TYPE_CHECKING: known_cpu_families = ( diff --git a/meta/recipes-devtools/meson/meson_1.10.2.bb b/meta/recipes-devtools/meson/meson_1.11.0.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.10.2.bb rename to meta/recipes-devtools/meson/meson_1.11.0.bb index 9832437531..d06ede78a0 100644 --- a/meta/recipes-devtools/meson/meson_1.10.2.bb +++ b/meta/recipes-devtools/meson/meson_1.11.0.bb @@ -14,7 +14,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ file://0001-Make-CPU-family-warnings-fatal.patch \ file://0002-Support-building-allarch-recipes-again.patch \ " -SRC_URI[sha256sum] = "7890287d911dd4ee1ebd0efb61ed0321bfcd87c725df923a837cf90c6508f96b" +SRC_URI[sha256sum] = "dffdd0915ceb028541fe3bed77d63ba35e78514591c043736b450d62634eeb31" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)$" inherit python_setuptools_build_meta github-releases