From patchwork Wed Nov 20 21:49:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8268 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Xtw4M4wybz3x4f for ; Wed, 20 Nov 2024 21:49:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Xtw4L01lwz4bg; Wed, 20 Nov 2024 21:49:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Xtw4K5ZD1z33y4; Wed, 20 Nov 2024 21:49:21 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Xtw4D19rmz33y4 for ; Wed, 20 Nov 2024 21:49:16 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Xtw4C46bpzfX; Wed, 20 Nov 2024 21:49:15 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1732139355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JwBuIZ39XZew7B/0LI39hWVCGNYRbdipnFo8FO3Fse0=; b=EfsEDIcBboTs3vUlw1kkWQ9S8z01Zk0vI87rCzJSW1gwsQRy/V5pDylcAye2UkXCQ3Mt73 z1Ql9PYmhdt0Q5CQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1732139355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JwBuIZ39XZew7B/0LI39hWVCGNYRbdipnFo8FO3Fse0=; b=c+q4nTpYbjhNxdJTqjfLHrtpFT0+6YOE6h9KHafFC1E0n3XPOPAqE7Wxoyp9n2026jJnew a0yglwHnmIjbizcpxhL5VF6n5h8OCAc92FlIjud1tPq16++Gld0zVgA3sf+iFAKqJNNqUj cuJPLLnyRCMrVlDDQuvBQqOuTei1vt5Mj6bXCzdpHu8WCD9EAQrdJ93O0R7G9T1UoAsA8h cZ/FczmSl0ef3p58VpO/DfknZjXdVpDGXOEyoDgir+CU8oeSdXuJYtfm5rWcB01yaJEtpB QEjelzj+x+gWKdESOpBuLikHqWsPSuQofTD1PACMTqOkUUVnAOFRM117BINu6A== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] meson: Update to version 1.6.0 Date: Wed, 20 Nov 2024 22:49:06 +0100 Message-ID: <20241120214909.2717383-4-adolf.belka@ipfire.org> In-Reply-To: <20241120214909.2717383-1-adolf.belka@ipfire.org> References: <20241120214909.2717383-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 3227HTWYQDPGAYTNFRJC6YJJ3O3JXDMT X-Message-ID-Hash: 3227HTWYQDPGAYTNFRJC6YJJ3O3JXDMT X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Update from version 1.5.1 to 1.6.0 - Update of rootfile - Changelog is too large to include here. 1.6.0 Support for OpenXL compiler in AIX. The OpenXL compiler is now supported from Meson 1.6.0 onwards. So currently, in AIX Operating system we support GCC and openXL compilers for Meson build system. Both the compilers will archive shared libraries and generate a shared object for a shared module while using Meson in AIX. alias_target of both_libraries Previously, when passing a both_libs object to alias_target(), the alias would only point to the shared library. It now points to both the static and the shared library. Default to printing deprecations when no minimum version is specified. For a long time, the project() function has supported specifying the minimum meson_version: needed by a project. When this is used, deprecated features from before that version produce warnings, as do features which aren't available in all supported versions. When no minimum version was specified, meson didn't warn you even about deprecated functionality that might go away in an upcoming semver major release of meson. Now, meson will treat an unspecified minimum version following semver: For new features introduced in the current meson semver major cycle (currently: all features added since 1.0) a warning is printed. Features that have been available since the initial 1.0 release are assumed to be widely available. For features that have been deprecated by any version of meson, a warning is printed. Since no minimum version was specified, it is assumed that the project wishes to follow the latest and greatest functionality. These warnings will overlap for functionality that was both deprecated and replaced with an alternative in the current release cycle. The combination means that projects without a minimum version specified are assumed to want broad compatibility with the current release cycle (1.x). Projects that specify a minimum meson_version: will continue to only receive actionable warnings based on their current minimum version. Cargo subprojects is experimental Cargo subprojects was intended to be experimental with no stability guarantees. That notice was unfortunately missing from documentation. Meson will now start warning about usage of experimental features and future releases might do breaking changes. This is aligned with our general policy regarding mixing build systems. Dependencies from CMake subprojects now use only PUBLIC link flags Any dep obtained from a CMake subproject (or .wrap with method = cmake) now only includes link flags marked in CMake as PUBLIC or INTERFACE. Flags marked as PRIVATE are now only applied when building the subproject library and not when using it as a dependency. This better matches how CMake handles link flags and fixes link errors when using some CMake projects as subprojects. New built-in option for default both_libraries both_libraries targets used to be considered as a shared library by default. There is now the default_both_libraries option to change this default. When default_both_libraries is 'auto', both_libraries() with dependencies that are both_libs themselves will link with the same kind of library. For example, if libA is a both_libs and libB is a both_libs linked with libA (or with an internal dependency on libA), the static lib of libB will link with the static lib of libA, and the shared lib of libA will link with the shared lib of libB. New as_static and as_shared methods on internal dependencies dep object returned by declare_dependency() now has .as_static() and .as_shared() methods, to convert to a dependency that prefers the static or the shared version of the linked both_libs target. When the same dependency is used without those methods, the default_both_libraries option determines which version is used. Support for DIA SDK Added support for Windows Debug Interface Access SDK (DIA SDK) dependency. It allows reading with MSVC debugging information (.PDB format). This dependency can only be used on Windows, with msvc, clang or clang-cl compiler. Support for LLVM-based flang compiler Added basic handling for the flang compiler that's now part of LLVM. It is the successor of another compiler named flang by largely the same group of developers, who now refer to the latter as "classic flang". Meson already supports classic flang, and the LLVM-based flang now uses the compiler-id 'llvm-flang'. nvc and nvc++ now support setting std The following standards are available for nvc: c89, c90, c99, c11, c17, c18, gnu90, gnu89, gnu99, gnu11, gnu17, gnu18. For nvc++: c++98, c++03, c++11, c++14, c++17, c++20, c++23, gnu++98, gnu++03, gnu++11, gnu++14, gnu++17, gnu++20 Tools can be selected when calling has_tools() on the Qt modules When checking for the presence of Qt tools, you can now explictly ask Meson which tools you need. This is particularly useful when you do not need lrelease because you are not shipping any translations. For example: qt6_mod = import('qt6') qt6_mod.has_tools(required: true, tools: ['moc', 'uic', 'rcc']) valid tools are moc, uic, rcc and lrelease. Simple tool to test build reproducibility Meson now ships with a command for testing whether your project can be built reproducibly. It can be used by running a command like the following in the source root of your project: meson reprotest --intermediaries -- --buildtype=debugoptimized All command line options after the -- are passed to the build invocations directly. This tool is not meant to be exhaustive, but instead easy and convenient to run. It will detect some but definitely not all reproducibility issues. Support for variable in system dependencies System Dependency method get_variable() now supports system variable. test() and benchmark() functions accept new types test and benchmark now accept ExternalPrograms (as returned by find_program) in the args list. This can be useful where the test executable is a wrapper which invokes another program given as an argument. test('some_test', find_program('sudo'), args : [ find_program('sh'), 'script.sh' ]) Zig 0.11 can be used as a C/C++ compiler frontend Zig offers a C/C++ frontend as a drop-in replacement for Clang. It worked fine with Meson up to Zig 0.10. Since 0.11, Zig's dynamic linker reports itself as zig ld, which wasn't known to Meson. Meson now correctly handles Zig's linker. You can use Zig's frontend via a machine file: [binaries] c = ['zig', 'cc'] cpp = ['zig', 'c++'] ar = ['zig', 'ar'] ranlib = ['zig', 'ranlib'] lib = ['zig', 'lib'] dlltool = ['zig', 'dlltool'] Signed-off-by: Adolf Belka --- config/rootfiles/common/meson | 15 ++++++++------- lfs/meson | 7 ++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/common/meson b/config/rootfiles/common/meson index 79f5ca6c2..a9b3ffbca 100644 --- a/config/rootfiles/common/meson +++ b/config/rootfiles/common/meson @@ -1,11 +1,11 @@ #usr/bin/meson -#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info -#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info/PKG-INFO -#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info/SOURCES.txt -#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info/dependency_links.txt -#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info/entry_points.txt -#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info/requires.txt -#usr/lib/python3.10/site-packages/meson-1.5.1-py3.10.egg-info/top_level.txt +#usr/lib/python3.10/site-packages/meson-1.6.0-py3.10.egg-info +#usr/lib/python3.10/site-packages/meson-1.6.0-py3.10.egg-info/PKG-INFO +#usr/lib/python3.10/site-packages/meson-1.6.0-py3.10.egg-info/SOURCES.txt +#usr/lib/python3.10/site-packages/meson-1.6.0-py3.10.egg-info/dependency_links.txt +#usr/lib/python3.10/site-packages/meson-1.6.0-py3.10.egg-info/entry_points.txt +#usr/lib/python3.10/site-packages/meson-1.6.0-py3.10.egg-info/requires.txt +#usr/lib/python3.10/site-packages/meson-1.6.0-py3.10.egg-info/top_level.txt #usr/lib/python3.10/site-packages/mesonbuild #usr/lib/python3.10/site-packages/mesonbuild/__init__.py #usr/lib/python3.10/site-packages/mesonbuild/_pathlib.py @@ -224,6 +224,7 @@ #usr/lib/python3.10/site-packages/mesonbuild/scripts/pycompile.py #usr/lib/python3.10/site-packages/mesonbuild/scripts/python_info.py #usr/lib/python3.10/site-packages/mesonbuild/scripts/regen_checker.py +#usr/lib/python3.10/site-packages/mesonbuild/scripts/reprotest.py #usr/lib/python3.10/site-packages/mesonbuild/scripts/run_tool.py #usr/lib/python3.10/site-packages/mesonbuild/scripts/scanbuild.py #usr/lib/python3.10/site-packages/mesonbuild/scripts/symbolextractor.py diff --git a/lfs/meson b/lfs/meson index 511d86876..435e3d177 100644 --- a/lfs/meson +++ b/lfs/meson @@ -24,7 +24,7 @@ include Config -VER = 1.5.1 +VER = 1.6.0 THISAPP = meson-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 3368b209444d0873217bafee2339b395dca9fa43df68adce19029a41ad5c0eca59426ef681d174ef8b6b89d4a6c5b4f189c1ae219deed78334028d44bdb23a95 +$(DL_FILE)_BLAKE2 = c1d8f143b17fab90c6128a721ac45b9ed6b85d67272149058e74ab827822b6f2c84ebdc261290585e6af38ab5dca52ca013de9b7be70922c96260fc5ee708893 install : $(TARGET) @@ -70,11 +70,8 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python3 setup.py build - cd $(DIR_APP) && python3 setup.py install --root=dest cd $(DIR_APP) && cp -rv dest/* / - @rm -rf $(DIR_APP) @$(POSTBUILD)