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 CF15A159C96 for ; Mon, 29 Jul 2024 01:19:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2ED77E2A67; Mon, 29 Jul 2024 01:19:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 0CE80E2A67 for ; Mon, 29 Jul 2024 01:19:46 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0500341256 for ; Mon, 29 Jul 2024 01:19:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87F2A1D87 for ; Mon, 29 Jul 2024 01:19:43 +0000 (UTC) From: "Eli Schwartz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eli Schwartz" Message-ID: <1722215947.bf408fd63c6aa6e9afd0546c4abdfc0990d9e6a2.eschwartz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-build/meson/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-build/meson/meson-1.4.1.ebuild dev-build/meson/meson-1.4.2.ebuild dev-build/meson/meson-1.5.0.ebuild dev-build/meson/meson-9999.ebuild X-VCS-Directories: dev-build/meson/ X-VCS-Committer: eschwartz X-VCS-Committer-Name: Eli Schwartz X-VCS-Revision: bf408fd63c6aa6e9afd0546c4abdfc0990d9e6a2 X-VCS-Branch: master Date: Mon, 29 Jul 2024 01:19:43 +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: 953a3054-8157-4caa-9e1d-9fd13899b9d0 X-Archives-Hash: decd9efb177ab420a474771bb4762c71 commit: bf408fd63c6aa6e9afd0546c4abdfc0990d9e6a2 Author: Eli Schwartz gentoo org> AuthorDate: Mon Jul 29 00:32:45 2024 +0000 Commit: Eli Schwartz gentoo org> CommitDate: Mon Jul 29 01:19:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf408fd6 dev-build/meson: disable CUDA tests If CUDA is installed, we try to test it and everything fails. The issue seems to be that CUDA simply cannot handle the use of LDFLAGS. It may be possible for meson to mangle these for you, but it currently does not. There's a tracking ticket for it. It's preferable to test common functionality rather than work around bugs. Just pretend CUDA doesn't exist as far as src_test is concerned. Closes: https://bugs.gentoo.org/936757 Signed-off-by: Eli Schwartz gentoo.org> dev-build/meson/meson-1.4.1.ebuild | 10 ++++++++++ dev-build/meson/meson-1.4.2.ebuild | 4 ++++ dev-build/meson/meson-1.5.0.ebuild | 4 ++++ dev-build/meson/meson-9999.ebuild | 4 ++++ 4 files changed, 22 insertions(+) diff --git a/dev-build/meson/meson-1.4.1.ebuild b/dev-build/meson/meson-1.4.1.ebuild index d30bc90b1103..db2001929162 100644 --- a/dev-build/meson/meson-1.4.1.ebuild +++ b/dev-build/meson/meson-1.4.1.ebuild @@ -82,12 +82,22 @@ python_prepare_all() { # ASAN is unsupported on some targets # https://bugs.gentoo.org/692822 -e 's/test_pch_with_address_sanitizer/_&/' + + # clippy-driver fails, but only when run via portage. + # + # error[E0463]: can't find crate for `std` + # error: requires `sized` lang_item + -e 's/test_rust_clippy/_&/' ) sed -i "${disable_unittests[@]}" unittests/*.py || die # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die + # nvcc breaks on essentially any LDFLAGS + # https://bugs.gentoo.org/936757 + # https://github.com/mesonbuild/meson/issues/11234 + rm -r "test cases/cuda"/* || die distutils-r1_python_prepare_all } diff --git a/dev-build/meson/meson-1.4.2.ebuild b/dev-build/meson/meson-1.4.2.ebuild index 4b7ba1a3634a..c1202d979e1c 100644 --- a/dev-build/meson/meson-1.4.2.ebuild +++ b/dev-build/meson/meson-1.4.2.ebuild @@ -94,6 +94,10 @@ python_prepare_all() { # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die + # nvcc breaks on essentially any LDFLAGS + # https://bugs.gentoo.org/936757 + # https://github.com/mesonbuild/meson/issues/11234 + rm -r "test cases/cuda"/* || die # The 1.4.2 tarball accidentally contains some untracked files from git master: # - subprojects/bar-0.1/Cargo.toml diff --git a/dev-build/meson/meson-1.5.0.ebuild b/dev-build/meson/meson-1.5.0.ebuild index 762876dc5e40..9cddc1a7a32d 100644 --- a/dev-build/meson/meson-1.5.0.ebuild +++ b/dev-build/meson/meson-1.5.0.ebuild @@ -94,6 +94,10 @@ python_prepare_all() { # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die + # nvcc breaks on essentially any LDFLAGS + # https://bugs.gentoo.org/936757 + # https://github.com/mesonbuild/meson/issues/11234 + rm -r "test cases/cuda"/* || die distutils-r1_python_prepare_all } diff --git a/dev-build/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild index 762876dc5e40..9cddc1a7a32d 100644 --- a/dev-build/meson/meson-9999.ebuild +++ b/dev-build/meson/meson-9999.ebuild @@ -94,6 +94,10 @@ python_prepare_all() { # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die + # nvcc breaks on essentially any LDFLAGS + # https://bugs.gentoo.org/936757 + # https://github.com/mesonbuild/meson/issues/11234 + rm -r "test cases/cuda"/* || die distutils-r1_python_prepare_all }