From 4c426cd766bd44ff984ebe1f5e37381bfa7db6a1 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 23 Dec 2024 17:10:48 +0800 Subject: meson: upgrade 1.6.0 -> 1.6.1 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 Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...le-do-not-manipulate-the-environment-when.patch | 8 +- meta/recipes-devtools/meson/meson_1.6.0.bb | 159 --------------------- meta/recipes-devtools/meson/meson_1.6.1.bb | 159 +++++++++++++++++++++ 3 files changed, 163 insertions(+), 163 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson_1.6.0.bb create mode 100644 meta/recipes-devtools/meson/meson_1.6.1.bb 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 23f96f4788..84a9c18c51 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 4ff04d388baf9d31efa73a92c0124a8d45b65377 Mon Sep 17 00:00:00 2001 +From f264b7fd2c86edfd5db77da264e8bf05f5e2bfeb 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 @@ -11,10 +11,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 fff4aaa..1fde2f6 100644 +index 326e605..f5eb50f 100644 --- a/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' return empty @@ -24,7 +24,7 @@ index fff4aaa..1fde2f6 100644 try: return PythonPkgConfigDependency(name, env, kwargs, installation, True) 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 elif name in os.environ: del os.environ[name] diff --git a/meta/recipes-devtools/meson/meson_1.6.0.bb b/meta/recipes-devtools/meson/meson_1.6.0.bb deleted file mode 100644 index 078e49e973..0000000000 --- a/meta/recipes-devtools/meson/meson_1.6.0.bb +++ /dev/null @@ -1,159 +0,0 @@ -HOMEPAGE = "http://mesonbuild.com" -SUMMARY = "A high performance build system" -DESCRIPTION = "Meson is a build system designed to increase programmer \ -productivity. It does this by providing a fast, simple and easy to use \ -interface for modern software development tools and practices." - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" - -GITHUB_BASE_URI = "https://github.com/mesonbuild/meson/releases/" -SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/meson-${PV}.tar.gz \ - file://meson-setup.py \ - file://meson-wrapper \ - file://0001-python-module-do-not-manipulate-the-environment-when.patch \ - file://0001-Make-CPU-family-warnings-fatal.patch \ - file://0002-Support-building-allarch-recipes-again.patch \ - file://0001-dependencies-dev-prepend-sysroot-when-searching-for-.patch \ - " -SRC_URI[sha256sum] = "999b65f21c03541cf11365489c1fad22e2418bb0c3d50ca61139f2eec09d5496" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)$" - -inherit python_setuptools_build_meta github-releases - -RDEPENDS:${PN} = "ninja python3-modules python3-pkg-resources" - -FILES:${PN} += "${datadir}/polkit-1" - -do_install:append () { - # As per the same issue in the python recipe itself: - # Unfortunately the following pyc files are non-deterministc due to 'frozenset' - # being written without strict ordering, even with PYTHONHASHSEED = 0 - # Upstream is discussing ways to solve the issue properly, until then let's - # just not install the problematic files. - # More info: http://benno.id.au/blog/2013/01/15/python-determinism - rm -f ${D}${libdir}/python*/site-packages/mesonbuild/dependencies/__pycache__/mpi.cpython* -} - -BBCLASSEXTEND = "native nativesdk" - -inherit meson-routines - -# The cross file logic is similar but not identical to that in meson.bbclass, -# since it's generating for an SDK rather than a cross-compile. Important -# differences are: -# - We can't set vars like CC, CXX, etc. yet because they will be filled in with -# real paths by meson-setup.sh when the SDK is extracted. -# - Some overrides aren't needed, since the SDK injects paths that take care of -# them. -def var_list2str(var, d): - items = d.getVar(var).split() - return repr(items[0]) if len(items) == 1 else ', '.join(repr(s) for s in items) - -def generate_native_link_template(d): - val = ['-L@{OECORE_NATIVE_SYSROOT}${libdir_native}', - '-L@{OECORE_NATIVE_SYSROOT}${base_libdir_native}', - '-Wl,-rpath-link,@{OECORE_NATIVE_SYSROOT}${libdir_native}', - '-Wl,-rpath-link,@{OECORE_NATIVE_SYSROOT}${base_libdir_native}', - '-Wl,--allow-shlib-undefined' - ] - build_arch = d.getVar('BUILD_ARCH') - if 'x86_64' in build_arch: - loader = 'ld-linux-x86-64.so.2' - elif 'i686' in build_arch: - loader = 'ld-linux.so.2' - elif 'aarch64' in build_arch: - loader = 'ld-linux-aarch64.so.1' - elif 'ppc64le' in build_arch: - loader = 'ld64.so.2' - elif 'loongarch64' in build_arch: - loader = 'ld-linux-loongarch-lp64d.so.1' - elif 'riscv64' in build_arch: - loader = 'ld-linux-riscv64-lp64d.so.1' - - if loader: - val += ['-Wl,--dynamic-linker=@{OECORE_NATIVE_SYSROOT}${base_libdir_native}/' + loader] - - return repr(val) - -install_templates() { - install -d ${D}${datadir}/meson - - cat >${D}${datadir}/meson/meson.native.template <${D}${datadir}/meson/meson.cross.template <${D}${datadir}/meson/meson.native.template <${D}${datadir}/meson/meson.cross.template <