diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-14 10:30:13 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-14 10:30:13 +0100 |
commit | 616579b5d773c50af31ee56f00105d96ce641ca2 (patch) | |
tree | 2ad4d3ba1429bd93a36ab99a2f5ec3490412115e /dev-util/hip/files | |
parent | 068424b26532f3551a81421a9be67ed206e5c11a (diff) |
gentoo resync : 14.08.2021
Diffstat (limited to 'dev-util/hip/files')
-rw-r--r-- | dev-util/hip/files/hip-4.2.0-cancel-hcc-header-removal.patch | 18 | ||||
-rw-r--r-- | dev-util/hip/files/hip-4.2.0-config-cmake-in.patch | 15 | ||||
-rw-r--r-- | dev-util/hip/files/hipvars.pm | 7 |
3 files changed, 37 insertions, 3 deletions
diff --git a/dev-util/hip/files/hip-4.2.0-cancel-hcc-header-removal.patch b/dev-util/hip/files/hip-4.2.0-cancel-hcc-header-removal.patch new file mode 100644 index 000000000000..08e0f3a3d4e3 --- /dev/null +++ b/dev-util/hip/files/hip-4.2.0-cancel-hcc-header-removal.patch @@ -0,0 +1,18 @@ +hcc now deprecated by ROCm upstream. They use cmake to delete hcc headers for upgrating hip on other distros, +but Gentoo don't need this and the following code causes sandbox violation (#799257). + +github.com/ROCm-Developer-Tools/HIP/commit/c2adc70d4df3d30ef0db84d47be14b99b01aa340 introduce these lines. + +--- orig/CMakeLists.txt ++++ HIP-rocm-4.2.0/CMakeLists.txt +@@ -333,10 +333,6 @@ if(NOT ${INSTALL_SOURCE} EQUAL 0) + endif() + install(DIRECTORY bin DESTINATION . USE_SOURCE_PERMISSIONS) + +- # The following two lines will be removed after upstream updation +- install(CODE "MESSAGE(\"Removing ${CMAKE_INSTALL_PREFIX}/include\")") +- install(CODE "file(REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/include)") +- + install(DIRECTORY include DESTINATION .) + install(DIRECTORY cmake DESTINATION .) + endif() diff --git a/dev-util/hip/files/hip-4.2.0-config-cmake-in.patch b/dev-util/hip/files/hip-4.2.0-config-cmake-in.patch new file mode 100644 index 000000000000..12644828af78 --- /dev/null +++ b/dev-util/hip/files/hip-4.2.0-config-cmake-in.patch @@ -0,0 +1,15 @@ +since _IMPORT_PREFIX=/opt/gentoo/usr/lib/hip, INTERFACE_INCLUDE_DIRECTORIES should change + +--- orig/hip-config.cmake.in ++++ HIP-rocm-4.2.0/hip-config.cmake.in +@@ -185,8 +185,8 @@ if(HIP_RUNTIME MATCHES "rocclr") + + if(NOT WIN32) + set_target_properties(hip::device PROPERTIES +- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include" +- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include" ++ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" ++ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + ) + endif() + endif() diff --git a/dev-util/hip/files/hipvars.pm b/dev-util/hip/files/hipvars.pm index 3f5c88409e0a..4c614080a119 100644 --- a/dev-util/hip/files/hipvars.pm +++ b/dev-util/hip/files/hipvars.pm @@ -1,9 +1,10 @@ #!/usr/bin/perl -w package hipvars; -$HIP_BASE_VERSION_MAJOR = "4"; -$HIP_BASE_VERSION_MINOR = "1"; +$HIP_BASE_VERSION_MAJOR = "@HIP_BASE_VERSION_MAJOR@"; +$HIP_BASE_VERSION_MINOR = "@HIP_BASE_VERSION_MINOR@"; +$isWindows = 0; $HIP_PATH='/usr/lib/hip'; $ROCM_PATH='/usr'; $CUDA_PATH='/opt/cuda'; @@ -15,5 +16,5 @@ $HIP_COMPILER = "clang"; $HIP_RUNTIME = "rocclr"; $HIP_VERSION_MAJOR = $HIP_BASE_VERSION_MAJOR; $HIP_VERSION_MINOR = $HIP_BASE_VERSION_MINOR; -$HIP_VERSION_PATCH = "0"; +$HIP_VERSION_PATCH = "@HIP_VERSION_PATCH@"; $HIP_VERSION="$HIP_VERSION_MAJOR.$HIP_VERSION_MINOR.$HIP_VERSION_PATCH"; |