diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-12-19 19:49:08 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-19 19:49:08 +0000 |
commit | f287ecad888abdeb38e617d0485de282cd6819db (patch) | |
tree | 874d56500040734c4dbb9e437e0d5ed80a0a1886 /dev-libs/rocm-opencl-runtime/files | |
parent | 844ae757702c53a56ee57056873a8204d256d47e (diff) |
gentoo auto-resync : 19:12:2022 - 19:49:08
Diffstat (limited to 'dev-libs/rocm-opencl-runtime/files')
6 files changed, 0 insertions, 189 deletions
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.10.0-add-rocclr-include-directories.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.10.0-add-rocclr-include-directories.patch deleted file mode 100644 index 13fc581b4cd9..000000000000 --- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.10.0-add-rocclr-include-directories.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/amdocl/CMakeLists.txt 2020-12-05 22:05:55.838529158 +0100 -+++ b/amdocl/CMakeLists.txt 2020-12-05 22:07:35.677524507 +0100 -@@ -23,6 +23,9 @@ - include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos) - include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers) - include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers/opencl2.2) -+include_directories(/usr/include/rocclr) -+include_directories(/usr/include/rocclr/compiler/lib/include/) -+include_directories(/usr/include/rocclr/elf/) - - if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR - (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang")) diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch deleted file mode 100644 index 357b97c7f49e..000000000000 --- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/amdocl/CMakeLists.txt 2020-08-23 10:11:28.227839351 +0200 -+++ b/amdocl/CMakeLists.txt 2020-08-23 10:44:34.929831772 +0200 -@@ -23,6 +23,8 @@ - include_directories(${CMAKE_SOURCE_DIR}/khronos) - include_directories(${CMAKE_SOURCE_DIR}/khronos/headers) - include_directories(${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2) -+include_directories(/usr/include/rocclr) -+include_directories(/usr/include/rocclr/compiler/lib/include/) - - if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR - (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang")) diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-amdocl64icd.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-amdocl64icd.patch deleted file mode 100644 index 6541c69bd48a..000000000000 --- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-amdocl64icd.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/amdocl/CMakeLists.txt 2020-08-23 10:11:28.227839351 +0200 -+++ b/amdocl/CMakeLists.txt 2020-08-23 10:12:03.697839216 +0200 -@@ -76,3 +76,7 @@ - add_library(amdocl64 SHARED ${amdocl64_src}) - - target_link_libraries(amdocl64 amdrocclr_static Threads::Threads dl ${ADDITIONAL_LIBRARIES}) -+ -+file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/amdocl64.icd" CONTENT "$<TARGET_FILE_NAME:amdocl64>") -+install(FILES "${CMAKE_BINARY_DIR}/amdocl64.icd" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/OpenCL/vendors/") -+ diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-change-install-location.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-change-install-location.patch deleted file mode 100644 index 77ce5e9bd332..000000000000 --- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.7.0-change-install-location.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/CMakeLists.txt 2020-08-23 10:14:54.337838565 +0200 -+++ b/CMakeLists.txt 2020-08-23 10:18:26.993837753 +0200 -@@ -14,6 +14,8 @@ - #example command: - # cmake -DCMAKE_PREFIX_PATH=/path/to/ROCclr/build/or/install .. - -+include (GNUInstallDirs) -+ - set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2" CACHE PATH "") - option(BUILD_SHARED_LIBS "Build shared libs" ON) - -@@ -60,7 +62,7 @@ - - add_subdirectory(khronos/icd) - add_subdirectory(amdocl) --add_subdirectory(tools/clinfo) -+#add_subdirectory(tools/clinfo) - add_subdirectory(tools/cltrace) - if(BUILD_TESTS) - add_subdirectory(tests/ocltst) -@@ -96,34 +98,34 @@ - ###--- Packaging ------------------------------------------------------------### - - # MAIN package --install(PROGRAMS $<TARGET_FILE:clinfo> -- DESTINATION bin -- COMPONENT MAIN) --install(PROGRAMS $<TARGET_FILE:cltrace> -- DESTINATION lib -- COMPONENT MAIN) -+#install(PROGRAMS $<TARGET_FILE:clinfo> -+# DESTINATION bin -+# COMPONENT MAIN) -+#install(PROGRAMS $<TARGET_FILE:cltrace> -+# DESTINATION lib -+# COMPONENT MAIN) - install(PROGRAMS $<TARGET_FILE:amdocl64> -- DESTINATION lib -- COMPONENT MAIN) --install(PROGRAMS $<TARGET_FILE:OpenCL> -- DESTINATION lib -- COMPONENT MAIN) --install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL> -- DESTINATION lib -+ DESTINATION lib64 - COMPONENT MAIN) -+#install(PROGRAMS $<TARGET_FILE:OpenCL> -+# DESTINATION lib -+# COMPONENT MAIN) -+#install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL> -+# DESTINATION lib -+# COMPONENT MAIN) - - # DEV package --install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL" -- DESTINATION include -- COMPONENT DEV -- USE_SOURCE_PERMISSIONS -- PATTERN cl_d3d10.h EXCLUDE -- PATTERN cl_d3d11.h EXCLUDE -- PATTERN cl_dx9_media_sharing.h EXCLUDE -- PATTERN cl_egl.h EXCLUDE) --install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL> -- DESTINATION lib -- COMPONENT DEV) -+#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL" -+# DESTINATION include -+# COMPONENT DEV -+# USE_SOURCE_PERMISSIONS -+# PATTERN cl_d3d10.h EXCLUDE -+# PATTERN cl_d3d11.h EXCLUDE -+# PATTERN cl_dx9_media_sharing.h EXCLUDE -+# PATTERN cl_egl.h EXCLUDE) -+#install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL> -+# DESTINATION lib -+# COMPONENT DEV) - - ############################# - # Packaging steps diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch deleted file mode 100644 index e9341675d890..000000000000 --- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/amdocl/CMakeLists.txt 2020-08-23 10:11:28.227839351 +0200 -+++ b/amdocl/CMakeLists.txt 2020-08-23 10:44:34.929831772 +0200 -@@ -23,6 +23,9 @@ - include_directories(${CMAKE_SOURCE_DIR}/khronos) - include_directories(${CMAKE_SOURCE_DIR}/khronos/headers) - include_directories(${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2) -+include_directories(/usr/include/rocclr) -+include_directories(/usr/include/rocclr/compiler/lib/include/) -+include_directories(/usr/include/rocclr/elf/) - - if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR - (CMAKE_${COMPILER}_COMPILER_ID MATCHES "Clang")) diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.2.0-opencl3-header.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.2.0-opencl3-header.patch deleted file mode 100644 index 14191adb5d0c..000000000000 --- a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.2.0-opencl3-header.patch +++ /dev/null @@ -1,65 +0,0 @@ -See bug #789717. - -Once opencl-headers is upgraded to 3.0 or higher this package starts -complaining left and right about missing header definitions for -CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR. The correct header for this -definiton did move as of opencl-headers 3.0 so this makes some sense. -(Actually I suspect there is a header-guard mismatch behind this problem). - -Most of this can be fixed by using -isystem instead of -I for the opencl -headers. Although not terribly well documented, -isystem in lieu of -I -comports with best practices for overriding 3rd-party header files in -system include directories according to the gcc info pages. Why and how -are apparently undocumented and appear to be somewhere inside the gcc -fixincludes rabbit-hole. - -This still leaves a similar issue compiling the amdocl files which -is addressed here with an extra #include. - --gmt - -diff -urpN ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/CMakeLists.txt ROCm-OpenCL-Runtime-rocm-4.1.0/amdocl/CMakeLists.txt ---- ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/CMakeLists.txt 2021-06-26 14:52:32.446875129 -0700 -+++ ROCm-OpenCL-Runtime-rocm-4.1.0/amdocl/CMakeLists.txt 2021-06-26 15:00:30.401582470 -0700 -@@ -19,10 +19,10 @@ if(CMAKE_BUILD_TYPE MATCHES "^Debug$") - add_definitions(-DDEBUG) - endif() - --include_directories(${CMAKE_CURRENT_LIST_DIR}/..) --include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos) --include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers) --include_directories(${CMAKE_CURRENT_LIST_DIR}/../khronos/headers/opencl2.2) -+include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/..) -+include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../khronos) -+include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../khronos/headers) -+include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../khronos/headers/opencl2.2) - include_directories(/usr/include/rocclr) - include_directories(/usr/include/rocclr/compiler/lib/include/) - include_directories(/usr/include/rocclr/elf/) -diff -urpN ROCm-OpenCL-Runtime-rocm-4.1.0.orig/khronos/icd/CMakeLists.txt ROCm-OpenCL-Runtime-rocm-4.1.0/khronos/icd/CMakeLists.txt ---- ROCm-OpenCL-Runtime-rocm-4.1.0.orig/khronos/icd/CMakeLists.txt 2021-06-26 14:52:32.445875109 -0700 -+++ ROCm-OpenCL-Runtime-rocm-4.1.0/khronos/icd/CMakeLists.txt 2021-06-26 14:59:01.600778554 -0700 -@@ -121,10 +121,10 @@ else() - endif () - endif () - --include_directories (${OPENCL_ICD_LOADER_HEADERS_DIR}) -+include_directories (SYSTEM ${OPENCL_ICD_LOADER_HEADERS_DIR}) - add_definitions (-DCL_TARGET_OPENCL_VERSION=220) - --target_include_directories (OpenCL PRIVATE ${CMAKE_CURRENT_BINARY_DIR} loader) -+target_include_directories (OpenCL SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR} loader) - target_link_libraries (OpenCL ${CMAKE_DL_LIBS}) - - include (CTest) -diff -urpN ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/cl_common.hpp ROCm-OpenCL-Runtime-rocm-4.1.0/amdocl/cl_common.hpp ---- ROCm-OpenCL-Runtime-rocm-4.1.0.orig/amdocl/cl_common.hpp 2021-02-02 10:01:38.000000000 -0800 -+++ ROCm-OpenCL-Runtime-rocm-4.1.0/amdocl/cl_common.hpp 2021-06-26 15:40:57.584449532 -0700 -@@ -21,6 +21,7 @@ - #ifndef CL_COMMON_HPP_ - #define CL_COMMON_HPP_ - -+#include <CL/cl_gl_ext.h> - #ifdef _WIN32 - #include <CL/cl_d3d11.h> - #include <CL/cl_d3d10.h> |