From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1608673-garchives=archives.gentoo.org@lists.gentoo.org>
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 44AA0158041
for <garchives@archives.gentoo.org>; Fri, 8 Mar 2024 19:22:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6EA5DE29FD;
Fri, 8 Mar 2024 19:22:56 +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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 283F1E29FD
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Mar 2024 19:22:56 +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 C12F433BF08
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Mar 2024 19:22:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E769914F8
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Mar 2024 19:22:51 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1709925722.d2c1e1404904f9ca7daeaa1cc828708a81188b90.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
X-VCS-Directories: sci-libs/rocFFT/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: d2c1e1404904f9ca7daeaa1cc828708a81188b90
X-VCS-Branch: master
Date: Fri, 8 Mar 2024 19:22:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 98eaebee-7678-465c-ba64-a993527a9475
X-Archives-Hash: a5d509659a026dbae4408a19aaf7d45b
commit: d2c1e1404904f9ca7daeaa1cc828708a81188b90
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Wed Mar 6 16:02:21 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 19:22:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c1e140
sci-libs/rocFFT: fix benchmark dependencies and collision with dev-util/perf
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{rocFFT-5.7.1-r1.ebuild => rocFFT-5.7.1-r2.ebuild} | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
similarity index 93%
rename from sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild
rename to sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
index 4a924bd502a7..f4ddb494bf35 100644
--- a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
ROCM_VERSION=${PV}
inherit cmake check-reqs edo multiprocessing python-r1 rocm
@@ -30,9 +30,11 @@ perfscripts? (
${PYTHON_DEPS}"
DEPEND="=dev-util/hip-5*
- ${PYTHON_DEPS}"
-
-BDEPEND="
+ ${PYTHON_DEPS}
+ benchmark? (
+ dev-libs/boost
+ sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
+ )
test? (
dev-cpp/gtest
dev-libs/boost
@@ -40,6 +42,9 @@ BDEPEND="
sys-libs/libomp
sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}]
)
+"
+
+BDEPEND="
>=dev-build/cmake-3.22
dev-build/rocm-cmake
dev-db/sqlite
@@ -137,6 +142,11 @@ src_install() {
if use benchmark; then
cd "${BUILD_DIR}"/clients/staging || die
dobin *rider
+
+ if ! use perfscripts; then
+ # prevent collision with dev-util/perf
+ rm -rf "${ED}"/usr/bin/perf || die
+ fi
fi
if use perfscripts; then