public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
Date: Fri,  8 Mar 2024 19:22:51 +0000 (UTC)	[thread overview]
Message-ID: <1709925722.d2c1e1404904f9ca7daeaa1cc828708a81188b90.sam@gentoo> (raw)

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


             reply	other threads:[~2024-03-08 19:22 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-08 19:22 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-08 10:07 [gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/ Patrick Lauer
2025-01-26 14:07 Sam James
2025-01-05 21:49 Sam James
2024-09-09 18:20 Sam James
2024-06-26  9:21 Sam James
2024-03-08 19:22 Sam James
2023-11-19 16:32 Benda XU
2023-07-30  4:39 Benda XU
2023-07-30  4:39 Benda XU
2023-07-05 18:15 Craig Andrews
2022-12-19 14:00 Andreas Sturmlechner
2022-08-06 14:23 Benda XU
2022-07-09  6:10 Benda XU
2022-07-09  6:10 Benda XU
2022-07-09  6:10 Benda XU
2022-03-20  8:57 Benda XU
2021-01-24  7:49 Benda XU

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1709925722.d2c1e1404904f9ca7daeaa1cc828708a81188b90.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox