From fc0402dbd7b88bb4d6b9c8bdd70388f61ded7a14 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 2 Jan 2024 15:20:08 +0800 Subject: meson: upgrade 1.3.0 -> 1.3.1 0001-Make-CPU-family-warnings-fatal.patch 0001-python-module-do-not-manipulate-the-environment-when.patch 0002-Support-building-allarch-recipes-again.patch refreshed for 1.3.1 (From OE-Core rev: 51b5e79cd37de982492991e56362cf1f0ef2ab8e) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../0001-Make-CPU-family-warnings-fatal.patch | 10 +- ...le-do-not-manipulate-the-environment-when.patch | 8 +- ...02-Support-building-allarch-recipes-again.patch | 12 +- meta/recipes-devtools/meson/meson_1.3.0.bb | 157 --------------------- meta/recipes-devtools/meson/meson_1.3.1.bb | 157 +++++++++++++++++++++ 5 files changed, 171 insertions(+), 173 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson_1.3.0.bb create mode 100644 meta/recipes-devtools/meson/meson_1.3.1.bb (limited to 'meta') 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 8fbcb5a0a2..8ea7c35950 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 fcd3260c03f313676720e6219c5953d412fb0a2c Mon Sep 17 00:00:00 2001 +From b77cbe67df5fa0998946503f207c256ee740bb5f 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 @@ -12,10 +12,10 @@ Signed-off-by: Ross Burton 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 7e0c567..a180065 100644 +index 07f1229..a35c356 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -284,8 +284,8 @@ class MachineInfo(HoldableObject): +@@ -285,8 +285,8 @@ class MachineInfo(HoldableObject): 'but is missing {}.'.format(minimum_literal - set(literal))) cpu_family = literal['cpu_family'] @@ -27,10 +27,10 @@ index 7e0c567..a180065 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index e212c7a..9d2bff3 100644 +index 2ba2054..d798e3b 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -345,10 +345,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -359,10 +359,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 19502fa9cd..2e0a4b1bbe 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 a97dba12cff6c4c9181909141a1a9f38d7c900bf Mon Sep 17 00:00:00 2001 +From e85683698aa3556bf14fc6d35f2c067f16af520b 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 14386f9..118a15f 100644 +index 9aea6bd..8c13ede 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py -@@ -354,9 +354,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -380,9 +380,6 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', empty.name = 'python' return empty @@ -25,7 +25,7 @@ index 14386f9..118a15f 100644 try: return PythonPkgConfigDependency(name, env, kwargs, installation, True) finally: -@@ -365,8 +362,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice', +@@ -391,8 +388,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/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index dcc1ce9c27..a8396f30bb 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,21 +1,22 @@ -From 656bf55fed01df2d2e2ad6d9d9887173cb16b85c Mon Sep 17 00:00:00 2001 +From 6fb8db54929b40e1fd7ac949ef44f0d37df0bae9 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 26 Jul 2018 16:32:49 +0200 -Subject: [PATCH 2/2] Support building allarch recipes again +Subject: [PATCH] Support building allarch recipes again This registers "allarch" as a known CPU family. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Peter Kjellerstedt + --- mesonbuild/envconfig.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 4d58c91..ff01ad1 100644 +index a35c356..436355f 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -36,6 +36,7 @@ from pathlib import Path +@@ -38,6 +38,7 @@ from pathlib import Path known_cpu_families = ( @@ -23,6 +24,3 @@ index 4d58c91..ff01ad1 100644 'aarch64', 'alpha', 'arc', --- -2.24.0 - diff --git a/meta/recipes-devtools/meson/meson_1.3.0.bb b/meta/recipes-devtools/meson/meson_1.3.0.bb deleted file mode 100644 index e794bb28a5..0000000000 --- a/meta/recipes-devtools/meson/meson_1.3.0.bb +++ /dev/null @@ -1,157 +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 \ - " -SRC_URI[sha256sum] = "4ba253ef60e454e23234696119cbafa082a0aead0bd3bbf6991295054795f5dc" - -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 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 <