From cb82bbbbc01a5b4fdc73d91f236a9ba2476e0c82 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 25 Sep 2024 14:48:54 +0800 Subject: meson: upgrade 1.5.1 -> 1.5.2 0001-Make-CPU-family-warnings-fatal.patch refreshed for 1.5.2 Changelog: ============ - nasm: Use different test sources for x86 and x86_64 - mdist: correctly detect dirty hg repos with non-English locale, redux - backend/ninja: Generate sysroot in rust-project.json - mdist: detect pathological git repo cases and show a slightly better error - compilers: Pass mode to determine_args, not its string value - CI: mark arch as skipping frameworks/libgcrypt - When configuring fails in Github Actions, print folded logs - Prevent raw exception during project() - compilers: avoid -Wunused-value compiler warning in CLikeCompiler.has_type() - compilers: avoid -Wunused-value compiler warning in CLikeCompiler.has_members() - mformat: better handling of continuation lines - mformat: detect invalid config - tests: handle uncommon architecture format for nm - mformat: regenerate long lines even if they're already multiline - Add support for LLVM 19 in Debian. - mformat: provide nice error message instead of backtrace for invalid value - mformat: A triple string with a ' in it cannot be simplified - tests/format: Make the compare script more useful - linkers: skip -export_dynamic flag before MacOS 10.7 - format: fix indentation of comments - mformat: correctly handle editorconfig files without the root setting - cargo: Ignore Cargo.lock if toml implementation is missing - compilers: do not strip '-isystem' from C build arguments - Fix compiling ObjC/ObjC++ on Windows/MinGW - mformat: fix formatting of empty build file - tests: nasm: make it easier to debug generator() style build - mdist: correctly detect dirty hg repos with non-English locale (From OE-Core rev: 292b015bae6fdd11f086dc30f385f45ef2f0eb8d) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../0001-Make-CPU-family-warnings-fatal.patch | 6 +- meta/recipes-devtools/meson/meson_1.5.1.bb | 158 --------------------- meta/recipes-devtools/meson/meson_1.5.2.bb | 158 +++++++++++++++++++++ 3 files changed, 161 insertions(+), 161 deletions(-) delete mode 100644 meta/recipes-devtools/meson/meson_1.5.1.bb create mode 100644 meta/recipes-devtools/meson/meson_1.5.2.bb 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 04abb8b314..b272fd45b0 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 33bc81d5a262e0fa1a346ac1667a3679a17c0997 Mon Sep 17 00:00:00 2001 +From 13e05ca933a572c1caf93372df808a30976f99cd 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 86bad9b..9703315 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 5bccb90..6aa4b15 100644 +index 484ef45..cf4a3ba 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -387,10 +387,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -389,10 +389,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_1.5.1.bb b/meta/recipes-devtools/meson/meson_1.5.1.bb deleted file mode 100644 index 4f68a22fa9..0000000000 --- a/meta/recipes-devtools/meson/meson_1.5.1.bb +++ /dev/null @@ -1,158 +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] = "567e533adf255de73a2de35049b99923caf872a455af9ce03e01077e0d384bed" -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 <