From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99ABD158041 for ; Tue, 19 Mar 2024 05:51:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7FF0E29AE; Tue, 19 Mar 2024 05:50:59 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id A066FE29AE for ; Tue, 19 Mar 2024 05:50:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id AB4CA340BEF for ; Tue, 19 Mar 2024 05:50:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8B9E156E for ; Tue, 19 Mar 2024 05:50:56 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1710827309.f7eb1d145dafea17188ee0f0d735436a86123e3e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-build/meson/meson-9999.ebuild X-VCS-Directories: dev-build/meson/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f7eb1d145dafea17188ee0f0d735436a86123e3e X-VCS-Branch: master Date: Tue, 19 Mar 2024 05:50:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c6a6b6a1-29b5-450e-a25f-780def9b4e87 X-Archives-Hash: b70d4a9d21e1b9b3acf8d61e7ddde4c2 commit: f7eb1d145dafea17188ee0f0d735436a86123e3e Author: Eli Schwartz gmail com> AuthorDate: Tue Mar 19 05:13:50 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 19 05:48:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7eb1d14 dev-build/meson: sync live Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> dev-build/meson/meson-9999.ebuild | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild index 4e7497b5c819..f089b6a869b1 100644 --- a/dev-build/meson/meson-9999.ebuild +++ b/dev-build/meson/meson-9999.ebuild @@ -28,7 +28,7 @@ else fi fi -inherit bash-completion-r1 distutils-r1 toolchain-funcs +inherit bash-completion-r1 flag-o-matic distutils-r1 toolchain-funcs DESCRIPTION="Open source build system" HOMEPAGE="https://mesonbuild.com/" @@ -52,6 +52,10 @@ RDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-1.2.1-python-path.patch +) + python_prepare_all() { local disable_unittests=( # ASAN and sandbox both want control over LD_PRELOAD @@ -61,12 +65,6 @@ python_prepare_all() { # ASAN is unsupported on some targets # https://bugs.gentoo.org/692822 -e 's/test_pch_with_address_sanitizer/_&/' - - # https://github.com/mesonbuild/meson/issues/7203 - -e 's/test_templates/_&/' - - # Broken due to python2 wrapper - -e 's/test_python_module/_&/' ) sed -i "${disable_unittests[@]}" unittests/*.py || die @@ -88,6 +86,16 @@ src_test() { python_test() { ( + # meson has its own tests for LTO support. We don't need to verify that + # all tests work when they happen to use it. And in particular, this + # breaks rust. + filter-lto + + # remove unwanted python_wrapper_setup contents + # We actually do want to non-error if python2 is installed and tested. + remove="${T}/${EPYTHON}/bin:" + PATH=${PATH/${remove}/} + # test_meson_installed unset PYTHONDONTWRITEBYTECODE @@ -107,8 +115,7 @@ python_test() { # value in JAVA_HOME, and the tests should get skipped. export JAVA_HOME=$(java-config -O 2>/dev/null) - # Call python3 instead of EPYTHON to satisfy test_meson_uninstalled. - python3 run_tests.py + ${EPYTHON} -u run_tests.py ) || die "Testing failed with ${EPYTHON}" }