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 12472158083 for ; Mon, 9 Sep 2024 18:20:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD29DE2A04; Mon, 9 Sep 2024 18:20:41 +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 9E0D2E2A03 for ; Mon, 9 Sep 2024 18:20:41 +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 A5AD134072E for ; Mon, 9 Sep 2024 18:20:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EE431CC8 for ; Mon, 9 Sep 2024 18:20:39 +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: <1725905711.31a45f02c1df2f828972c42210b298786bf122e6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-device-libs/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild dev-libs/rocm-device-libs/rocm-device-libs-6.1.2.ebuild X-VCS-Directories: dev-libs/rocm-device-libs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 31a45f02c1df2f828972c42210b298786bf122e6 X-VCS-Branch: master Date: Mon, 9 Sep 2024 18:20:39 +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: 5b43ac9b-6f17-4ca1-bd31-3b8df4d60a58 X-Archives-Hash: c0e974b7f3a223f17b4d912d8bf25bcb commit: 31a45f02c1df2f828972c42210b298786bf122e6 Author: Sv. Lockal gmail com> AuthorDate: Sat Jul 20 16:23:32 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Sep 9 18:15:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a45f02 dev-libs/rocm-device-libs: strip unsupported flags for potentially switched compiler Closes: https://bugs.gentoo.org/936099 Closes: https://bugs.gentoo.org/937276 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Sam James gentoo.org> dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild | 13 +++++++++---- dev-libs/rocm-device-libs/rocm-device-libs-6.1.2.ebuild | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild index 04fd989b95cb..bd28fb96d253 100644 --- a/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild +++ b/dev-libs/rocm-device-libs/rocm-device-libs-6.1.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 LLVM_COMPAT=( 18 ) -inherit cmake llvm-r1 +inherit cmake flag-o-matic llvm-r1 MY_P=llvm-project-rocm-${PV} components=( "amd/device-libs" ) @@ -66,12 +66,17 @@ src_prepare() { } src_configure() { + # Do not trust CMake with autoselecting Clang, as it autoselects the latest one + # producing too modern LLVM bitcode and causing linker errors in other packages. + # Clean up unsupported flags for the switched compiler, see #936099 + local -x CC="$(get_llvm_prefix)/bin/clang" + local -x CXX="$(get_llvm_prefix)/bin/clang++" + strip-unsupported-flags + local mycmakeargs=( -DLLVM_DIR="$(get_llvm_prefix)" ) - # do not trust CMake with autoselecting Clang, as it autoselects the latest one - # producing too modern LLVM bitcode and causing linker errors in other packages - CC="$(get_llvm_prefix)/bin/clang" CXX="$(get_llvm_prefix)/bin/clang++" cmake_src_configure + cmake_src_configure } src_install() { diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-6.1.2.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-6.1.2.ebuild index a6d5dd67438b..a19a93f076ef 100644 --- a/dev-libs/rocm-device-libs/rocm-device-libs-6.1.2.ebuild +++ b/dev-libs/rocm-device-libs/rocm-device-libs-6.1.2.ebuild @@ -4,7 +4,7 @@ EAPI=8 LLVM_COMPAT=( 18 ) -inherit cmake llvm-r1 +inherit cmake flag-o-matic llvm-r1 MY_P=llvm-project-rocm-${PV} components=( "amd/device-libs" ) @@ -67,12 +67,17 @@ src_prepare() { } src_configure() { + # Do not trust CMake with autoselecting Clang, as it autoselects the latest one + # producing too modern LLVM bitcode and causing linker errors in other packages. + # Clean up unsupported flags for the switched compiler, see #936099 + local -x CC="$(get_llvm_prefix)/bin/clang" + local -x CXX="$(get_llvm_prefix)/bin/clang++" + strip-unsupported-flags + local mycmakeargs=( -DLLVM_DIR="$(get_llvm_prefix)" ) - # do not trust CMake with autoselecting Clang, as it autoselects the latest one - # producing too modern LLVM bitcode and causing linker errors in other packages - CC="$(get_llvm_prefix)/bin/clang" CXX="$(get_llvm_prefix)/bin/clang++" cmake_src_configure + cmake_src_configure } src_install() {