commit: 582d164f4850c6c5b2b491214b404c58bad6e088 Author: Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com> AuthorDate: Mon Oct 21 02:26:26 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 26 13:59:29 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=582d164f
sci-libs/rocFFT: force using hip-config.cmake instead of FindHIP.cmake Closes: https://bugs.gentoo.org/932155 Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/rocFFT-6.1.1-find-hip-use-config.patch | 31 ++++++++++++++++++++++ sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild | 1 + sci-libs/rocFFT/rocFFT-6.1.1.ebuild | 3 ++- sci-libs/rocFFT/rocFFT-6.3.0.ebuild | 3 ++- 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/sci-libs/rocFFT/files/rocFFT-6.1.1-find-hip-use-config.patch b/sci-libs/rocFFT/files/rocFFT-6.1.1-find-hip-use-config.patch new file mode 100644 index 000000000000..27353eee35d1 --- /dev/null +++ b/sci-libs/rocFFT/files/rocFFT-6.1.1-find-hip-use-config.patch @@ -0,0 +1,31 @@ +Upstream PR: https://github.com/ROCm/rocFFT/pull/530 +From b29c984bfaaec9d372fb566f5136fe3c473ff22d Mon Sep 17 00:00:00 2001 +From: Yiyang Wu <[email protected]> +Date: Sun, 20 Oct 2024 23:22:50 +0800 +Subject: [PATCH] Require rocFFT use hip-config.cmake to find HIP + +Sometimes rocFFT use FindHIP.cmake which is not desired -- it does not +have hip::device and hip::host target imported and result in cmake +generating error. + +Reference: https://bugs.gentoo.org/932155 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bcb9819c..da697834 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -186,7 +186,7 @@ set(AMDGPU_TARGETS "${DEFAULT_GPUS}" CACHE STRING "Target default GPUs if AMDGPU + rocm_check_target_ids(AMDGPU_TARGETS TARGETS "${AMDGPU_TARGETS}") + + # HIP is required - library and clients use HIP to access the device +-find_package( HIP REQUIRED ) ++find_package( HIP REQUIRED CONFIG ) + + # The nvidia backend can be used to compile for CUDA devices. + # Specify the CUDA prefix in the CUDA_PREFIX variable. +-- +2.45.2 + diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild index 0c383fa01164..0c6bdd615391 100644 --- a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild @@ -61,6 +61,7 @@ S="${WORKDIR}/rocFFT-rocm-${PV}" PATCHES=( "${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch + "${FILESDIR}"/${PN}-6.1.1-find-hip-use-config.patch ) required_mem() { diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild index d1289f597217..da1508311eb7 100644 --- a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild +++ b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -59,6 +59,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch + "${FILESDIR}"/${PN}-6.1.1-find-hip-use-config.patch ) required_mem() { diff --git a/sci-libs/rocFFT/rocFFT-6.3.0.ebuild b/sci-libs/rocFFT/rocFFT-6.3.0.ebuild index c1a62e09e1a5..474f33952068 100644 --- a/sci-libs/rocFFT/rocFFT-6.3.0.ebuild +++ b/sci-libs/rocFFT/rocFFT-6.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -59,6 +59,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch + "${FILESDIR}"/${PN}-6.1.1-find-hip-use-config.patch ) required_mem() {
