diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /sci-libs/hipFFT/files | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'sci-libs/hipFFT/files')
-rw-r--r-- | sci-libs/hipFFT/files/hipFFT-5.0.2-gentoo-install-locations.patch | 28 | ||||
-rw-r--r-- | sci-libs/hipFFT/files/hipFFT-5.0.2-remove-git-dependency.patch | 35 |
2 files changed, 63 insertions, 0 deletions
diff --git a/sci-libs/hipFFT/files/hipFFT-5.0.2-gentoo-install-locations.patch b/sci-libs/hipFFT/files/hipFFT-5.0.2-gentoo-install-locations.patch new file mode 100644 index 000000000000..eefdb2aaaaf5 --- /dev/null +++ b/sci-libs/hipFFT/files/hipFFT-5.0.2-gentoo-install-locations.patch @@ -0,0 +1,28 @@ +Index: hipFFT-rocm-5.0.2/library/CMakeLists.txt +=================================================================== +--- hipFFT-rocm-5.0.2.orig/library/CMakeLists.txt ++++ hipFFT-rocm-5.0.2/library/CMakeLists.txt +@@ -81,7 +81,7 @@ target_include_directories( hipfft + PUBLIC $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/library/include> + $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include> + $<BUILD_INTERFACE:${HIP_INCLUDE_DIRS}> +- $<INSTALL_INTERFACE:include> ++ $<INSTALL_INTERFACE:include/hipfft> + ${HIP_INCLUDE_DIRS} + ) + +@@ -142,13 +142,11 @@ if( ROCM_FOUND ) + rocm_install_targets( TARGETS hipfft + INCLUDE + ${CMAKE_SOURCE_DIR}/library/include +- ${CMAKE_BINARY_DIR}/include +- PREFIX hipfft ) ++ ${CMAKE_BINARY_DIR}/include ) + rocm_export_targets( TARGETS hip::hipfft + PREFIX hipfft + DEPENDS PACKAGE hip + NAMESPACE hip:: ) +- rocm_install_symlink_subdir( hipfft ) + + # Package specific CPACK vars + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) diff --git a/sci-libs/hipFFT/files/hipFFT-5.0.2-remove-git-dependency.patch b/sci-libs/hipFFT/files/hipFFT-5.0.2-remove-git-dependency.patch new file mode 100644 index 000000000000..fb2c97936a42 --- /dev/null +++ b/sci-libs/hipFFT/files/hipFFT-5.0.2-remove-git-dependency.patch @@ -0,0 +1,35 @@ +Index: hipFFT-rocm-5.0.2/cmake/dependencies.cmake +=================================================================== +--- hipFFT-rocm-5.0.2.orig/cmake/dependencies.cmake ++++ hipFFT-rocm-5.0.2/cmake/dependencies.cmake +@@ -21,9 +21,6 @@ + # + # ############################################################################# + +-# Git +-find_package(Git REQUIRED) +- + # HIP + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) +Index: hipFFT-rocm-5.0.2/clients/CMakeLists.txt +=================================================================== +--- hipFFT-rocm-5.0.2.orig/clients/CMakeLists.txt ++++ hipFFT-rocm-5.0.2/clients/CMakeLists.txt +@@ -54,16 +54,6 @@ list( APPEND CMAKE_MODULE_PATH ${CMAKE_C + + include( build-options ) + +-if( GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git" ) +- message(STATUS "rocFFT submodule update") +- execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/clients/rocFFT +- RESULT_VARIABLE GIT_SUBMOD_RESULT) +- if( NOT GIT_SUBMOD_RESULT EQUAL "0" ) +- message(FATAL_ERROR "git submodule update --init --recursive failed with ${GIT_SUBMOD_RESULT}, please checkout submodules manually.") +- endif( ) +-endif( ) +- + if( NOT EXISTS "${CMAKE_SOURCE_DIR}/clients/rocFFT/CMakeLists.txt" ) + message(FATAL_ERROR "The rocFFT submodule is not present! Please update git submodules and try again. ${CMAKE_CURRENT_SOURCE_DIR}/clients/rocFFT/CMakeLists.txt") + endif( ) |