From f46572a8b55ee8676c518119b9953e0619f1daf3 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 4 Jun 2025 16:45:08 +0800 Subject: [PATCH] meson: upgrade 1.8.0 -> 1.8.1 0001-Make-CPU-family-warnings-fatal.patch 0001-python-module-do-not-manipulate-the-environment-when.patch refreshed for 1.8.1 Signed-off-by: Wang Mingyu Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 6 +++--- ...on-module-do-not-manipulate-the-environment-when.patch | 8 ++++---- .../meson/{meson_1.8.0.bb => meson_1.8.1.bb} | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) rename meta/recipes-devtools/meson/{meson_1.8.0.bb => meson_1.8.1.bb} (98%) 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 b5d05469679..98ca08c2ca9 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 a503c007d3db87acf711d110c01e11c2d087f99c Mon Sep 17 00:00:00 2001 +From c01e5e29953e0302988f2d60adc50ebfa0e5d670 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 @@ -26,10 +26,10 @@ index 43fad0c..27be871 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index f322cda..53a0ac0 100644 +index 2a9cf16..6b2bd6b 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -429,10 +429,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -436,10 +436,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: if compilers and not any_compiler_has_define(compilers, '__mips64'): trial = 'mips' diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch index 85a93c8e7a1..f6544470132 100644 --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch @@ -1,4 +1,4 @@ -From 859711f99ea9b183a1dffb9b97de09ad0fe9803b Mon Sep 17 00:00:00 2001 +From 6c3734f533ee7ad493188c8fc17bb1c65b65f0bd Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 19 Nov 2018 14:24:26 +0100 Subject: [PATCH] python module: do not manipulate the environment when calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py -index 3dab31c..b9307fc 100644 +index ab040b5..a34b271 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py -@@ -410,9 +410,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -412,9 +412,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', empty.name = 'python' return empty @@ -25,7 +25,7 @@ index 3dab31c..b9307fc 100644 try: return PythonPkgConfigDependency(name, env, kwargs, installation, True) finally: -@@ -421,8 +418,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -423,8 +420,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', os.environ[name] = value elif name in os.environ: del os.environ[name] diff --git a/meta/recipes-devtools/meson/meson_1.8.0.bb b/meta/recipes-devtools/meson/meson_1.8.1.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.8.0.bb rename to meta/recipes-devtools/meson/meson_1.8.1.bb index 78e0a0ed805..af4bc9fecd9 100644 --- a/meta/recipes-devtools/meson/meson_1.8.0.bb +++ b/meta/recipes-devtools/meson/meson_1.8.1.bb @@ -15,7 +15,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] = "0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f" +SRC_URI[sha256sum] = "b4e3b80e8fa633555abf447a95a700aba1585419467b2710d5e5bf88df0a7011" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)$" inherit python_setuptools_build_meta github-releases -- 2.47.3