commit: f30f41657916fb02bdbc61e441b982dc3439c2e8 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Mon Nov 20 03:53:32 2023 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Mon Nov 20 03:55:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30f4165
sci-libs/hipFFT: use HIP config. hipFFT is not updated in 5.7.1, and we need to manually backport it. Reference: https://github.com/ROCmSoftwarePlatform/hipFFT/pull/66 Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> .../hipFFT/files/hipFFT-5.7.1_hip-config.patch | 40 ++++++++++++++++++++++ sci-libs/hipFFT/hipFFT-5.7.1.ebuild | 1 + 2 files changed, 41 insertions(+) diff --git a/sci-libs/hipFFT/files/hipFFT-5.7.1_hip-config.patch b/sci-libs/hipFFT/files/hipFFT-5.7.1_hip-config.patch new file mode 100644 index 000000000000..71d75417c0d3 --- /dev/null +++ b/sci-libs/hipFFT/files/hipFFT-5.7.1_hip-config.patch @@ -0,0 +1,40 @@ +From c2b06a3b49257b3f89cf203895cf370e64e47b27 Mon Sep 17 00:00:00 2001 +From: trixirt <[email protected]> +Date: Mon, 31 Jul 2023 09:50:19 -0700 +Subject: [PATCH] Simplify finding the hip package + +On Fedora, where hip is installed as an rpm, its cmake files can +not be found and are reported as an error. + +CMake Error at cmake/dependencies.cmake:44 (find_package): + No "FindHIP.cmake" found in CMAKE_MODULE_PATH. + +This change treats hip as a normal package. + +Signed-off-by: Tom Rix <[email protected]> +--- + cmake/dependencies.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake +index 262478d..5810e37 100644 +--- a/cmake/dependencies.cmake ++++ b/cmake/dependencies.cmake +@@ -30,7 +30,7 @@ if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( WIN32 ) + find_package( HIP CONFIG REQUIRED ) + else() +- find_package( HIP MODULE REQUIRED ) ++ find_package( HIP REQUIRED ) + endif() + list( APPEND HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include" ) + endif() +@@ -41,7 +41,7 @@ else() + if( WIN32 ) + find_package( HIP CONFIG REQUIRED ) + else() +- find_package( HIP MODULE REQUIRED ) ++ find_package( HIP REQUIRED ) + endif() + endif() + endif() diff --git a/sci-libs/hipFFT/hipFFT-5.7.1.ebuild b/sci-libs/hipFFT/hipFFT-5.7.1.ebuild index affa5dc9b14b..dd9cbd1dc59c 100644 --- a/sci-libs/hipFFT/hipFFT-5.7.1.ebuild +++ b/sci-libs/hipFFT/hipFFT-5.7.1.ebuild @@ -28,6 +28,7 @@ S="${WORKDIR}/hipFFT-rocm-${PV}" PATCHES=( "${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch" "${FILESDIR}/${PN}-4.3.0-add-complex-header.patch" + "${FILESDIR}/${PN}-5.7.1_hip-config.patch" ) src_configure() {
