gentoo resync : 25.08.2020

2 files changed, 101 insertions, 0 deletions

diff --git a/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch b/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch
new file mode 100644
index 000000000000..fc9bacee5020
--- /dev/null
+++ b/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch
@@ -0,0 +1,49 @@
+From 98df37fc36b6276c26532e86e89be7e389745f4e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Torsten=20Ke=C3=9Fler?= <t.kessler@posteo.de>
+Date: Sun, 19 Jul 2020 11:58:24 +0200
+Subject: [PATCH] Fix search for OpenCL include dirs
+
+---
+ CMakeLists.txt | 26 +++++++++-----------------
+ 1 file changed, 9 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 122277ee..02ca4644 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,26 +53,18 @@ find_package(amd_comgr REQUIRED CONFIG
+ )
+ message(STATUS "Code Object Manager found at ${amd_comgr_DIR}.")
+ 
+-# FIXME: Use find_package(OpenCL)
+-find_library( OpenCL REQUIRED CONFIG
+-   PATHS
+-      /opt/rocm
++find_path(OPENCL_INCLUDE_DIR
++   NAMES OpenCL/cl.h CL/cl.h
++   PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64
++   PATHS ${OPENCL_DIR}
++   DOC "OpenCL include header OpenCL/cl.h or CL/cl.h"
+ )
+ 
+-if( NOT OPENCL_DIR )
+-   find_path(OPENCL_INCLUDE_DIR
+-      NAMES OpenCL/cl.h CL/cl.h
+-      PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64
+-      PATHS /opt/rocm
+-      DOC "OpenCL include header OpenCL/cl.h or CL/cl.h"
+-   )
+-
+-   if( NOT OPENCL_INCLUDE_DIR )
+-      unset(OPENCL_INCLUDE_DIR CACHE)
+-      set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE )
+-   endif()
+-      message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.")
++if( NOT OPENCL_INCLUDE_DIR )
++   unset(OPENCL_INCLUDE_DIR CACHE)
++   set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE )
+ endif()
++message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.")
+ 
+ 
+ 
diff --git a/dev-libs/rocclr/files/rocclr-3.7.0-cmake-install-destination.patch b/dev-libs/rocclr/files/rocclr-3.7.0-cmake-install-destination.patch
new file mode 100644
index 000000000000..3629fc71b3b3
--- /dev/null
+++ b/dev-libs/rocclr/files/rocclr-3.7.0-cmake-install-destination.patch
@@ -0,0 +1,52 @@
+--- a/CMakeLists.txt	2020-08-22 23:59:26.674785914 +0200
++++ b/CMakeLists.txt	2020-08-23 00:01:18.491783097 +0200
+@@ -253,8 +253,8 @@
+ 
+ install( TARGETS amdrocclr_static
+   EXPORT rocclr
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION lib64
++  LIBRARY DESTINATION lib64
+   COMPONENT applications)
+ 
+ install (
+@@ -262,31 +262,31 @@
+    DESTINATION include)
+ install (
+    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/elf"
+-   DESTINATION include
++   DESTINATION include/rocclr
+    FILES_MATCHING PATTERN "*.h*")
+ install (
+    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/compiler"
+-   DESTINATION include
++   DESTINATION include/rocclr
+    FILES_MATCHING PATTERN "*.h*")
+ install (
+    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils"
+-   DESTINATION include
++   DESTINATION include/rocclr
+    FILES_MATCHING PATTERN "*.h*")
+ install (
+    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/platform"
+-   DESTINATION include
++   DESTINATION include/rocclr
+    FILES_MATCHING PATTERN "*.h*")
+ install (
+    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/thread"
+-   DESTINATION include
++   DESTINATION include/rocclr
+    FILES_MATCHING PATTERN "*.h*")
+ install (
+    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/os"
+-   DESTINATION include
++   DESTINATION include/rocclr
+    FILES_MATCHING PATTERN "*.h*")
+ install (
+    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/device"
+-   DESTINATION include
++   DESTINATION include/rocclr
+    FILES_MATCHING PATTERN "*.h*")
+ 
+ # Generate the install-tree package.