From: Wang Mingyu <[email protected]> 0001-Make-CPU-family-warnings-fatal.patch 0001-python-module-do-not-manipulate-the-environment-when.patch refreshed for 1.6.0
Signed-off-by: Wang Mingyu <[email protected]> --- .../meson/meson/0001-Make-CPU-family-warnings-fatal.patch | 6 +++--- ...on-module-do-not-manipulate-the-environment-when.patch | 8 ++++---- .../meson/{meson_1.5.2.bb => meson_1.6.0.bb} | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) rename meta/recipes-devtools/meson/{meson_1.5.2.bb => meson_1.6.0.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 b272fd45b0..85f8a81cf4 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 13e05ca933a572c1caf93372df808a30976f99cd Mon Sep 17 00:00:00 2001 +From 57ab007ab3d510292d7ce7e8929eaaa93d169c51 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal @@ -26,10 +26,10 @@ index 86bad9b..9703315 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 484ef45..cf4a3ba 100644 +index 71a2f3a..4cbeabe 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -389,10 +389,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -416,10 +416,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 b4671f591f..d570cb01a0 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 66e350bbbd65e56a0d19c75710f61503e15e24a2 Mon Sep 17 00:00:00 2001 +From 17e9d8cefe934346b21333241446373868d2cdb0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 19 Nov 2018 14:24:26 +0100 Subject: [PATCH] python module: do not manipulate the environment when calling @@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py -index 883a29a..52bfbf3 100644 +index fff4aaa..1fde2f6 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py -@@ -399,9 +399,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -400,9 +400,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', empty.name = 'python' return empty @@ -24,7 +24,7 @@ index 883a29a..52bfbf3 100644 try: return PythonPkgConfigDependency(name, env, kwargs, installation, True) finally: -@@ -410,8 +407,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -411,8 +408,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.5.2.bb b/meta/recipes-devtools/meson/meson_1.6.0.bb similarity index 98% rename from meta/recipes-devtools/meson/meson_1.5.2.bb rename to meta/recipes-devtools/meson/meson_1.6.0.bb index beb1751e6f..46127b7a9b 100644 --- a/meta/recipes-devtools/meson/meson_1.5.2.bb +++ b/meta/recipes-devtools/meson/meson_1.6.0.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] = "f955e09ab0d71ef180ae85df65991d58ed8430323de7d77a37e11c9ea630910b" +SRC_URI[sha256sum] = "999b65f21c03541cf11365489c1fad22e2418bb0c3d50ca61139f2eec09d5496" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" inherit python_setuptools_build_meta github-releases -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#206320): https://lists.openembedded.org/g/openembedded-core/message/206320 Mute This Topic: https://lists.openembedded.org/mt/109203588/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
