mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

meson: upgrade 1.6.0 -> 1.6.1

Browse Source 
0001-python-module-do-not-manipulate-the-environment-when.patch
refreshed for 1.6.1

Changelog:
===========
- dependencies: support old vulkan SDK version
- Handle top level options set in subprojects. Closes #13847.
- ci: fix Ubuntu Bionic job
- modernize Rust template
- run_single_test.py: skip setup_symlinks() call on Windows
- tests: HDF5 no longer skips on MacOS
- mdevenv: exec directly into the program to run
- CMakeToolchain: Log output on compiler state failure
- msetup: Correction of the message text
- run_single_test.py: Fix for symlink changes
- libgcrypt-config is no more on ubuntu-rolling
- fix generate_gir with BothLibraries dependency
- env2mfile: add flag to use _FOR_BUILD envvars.
- environment: Never require an exe_wrapper for native builds
- rust: fix computation of library directory
- De-duplicate BuildTarget.sources
- Fix building on AIX when no project languages are used
- coverage.py: Guard use of --html-nested behind version check.
- Xcode backend: only use found appleframeworksn
- Enable GCC to find free-threaded python DLL library
- modules/rust: Add support for autolib field in the Cargo.toml
- env2mfile: Use a cross valac on Debian if possible
- env2mfile: Automatically set exe_wrapper on Debian if possible
- env2mfile: Use Debian cross-prefixed GObject-Introspection tools
- env2mfile: Generalize detection of pkg-config to have a list of tools
- Add GNU/Hurd kernel results

(From OE-Core rev: ca17f6c26c7f1fa93950143a41204daf57e5b4ed)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wang Mingyu
2024-12-23 17:10:48 +08:00
committed by Richard Purdie
parent 0fcfdd9617
commit 4c426cd766
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
+4 -4
View File
@@ -1,4 +1,4 @@
From 4ff04d388baf9d31efa73a92c0124a8d45b65377 Mon Sep 17 00:00:00 2001 From f264b7fd2c86edfd5db77da264e8bf05f5e2bfeb Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 19 Nov 2018 14:24:26 +0100 Date: Mon, 19 Nov 2018 14:24:26 +0100
Subject: [PATCH] python module: do not manipulate the environment when calling Subject: [PATCH] python module: do not manipulate the environment when calling
@@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 1 insertion(+), 5 deletions(-) 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py
index fff4aaa..1fde2f6 100644 index 326e605..f5eb50f 100644
--- a/mesonbuild/dependencies/python.py --- a/mesonbuild/dependencies/python.py
+++ b/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py
@@ -400,9 +400,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', @@ -403,9 +403,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
empty.name = 'python' empty.name = 'python'
return empty return empty
@@ -24,7 +24,7 @@ index fff4aaa..1fde2f6 100644
try: try:
return PythonPkgConfigDependency(name, env, kwargs, installation, True) return PythonPkgConfigDependency(name, env, kwargs, installation, True)
finally: finally:
@@ -411,8 +408,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', @@ -414,8 +411,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
os.environ[name] = value os.environ[name] = value
elif name in os.environ: elif name in os.environ:
del os.environ[name] del os.environ[name]
meta/recipes-devtools/meson/meson_1.6.0.bb → meta/recipes-devtools/meson/meson_1.6.1.bb
+1 -1
View File
@@ -16,7 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \
file://0002-Support-building-allarch-recipes-again.patch \ file://0002-Support-building-allarch-recipes-again.patch \
file://0001-dependencies-dev-prepend-sysroot-when-searching-for-.patch \ file://0001-dependencies-dev-prepend-sysroot-when-searching-for-.patch \
" "
SRC_URI[sha256sum] = "999b65f21c03541cf11365489c1fad22e2418bb0c3d50ca61139f2eec09d5496" SRC_URI[sha256sum] = "1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$"
inherit python_setuptools_build_meta github-releases inherit python_setuptools_build_meta github-releases