From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 2 Sep 2020 14:09:07 +0100
Subject: gentoo resync : 02.09.2020

---
 .../rocclr-3.5.0-cmake-install-destination.patch   | 53 ----------------------
 .../rocclr/files/rocclr-3.5.0-find-opencl.patch    | 49 --------------------
 2 files changed, 102 deletions(-)
 delete mode 100644 dev-libs/rocclr/files/rocclr-3.5.0-cmake-install-destination.patch
 delete mode 100644 dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch

(limited to 'dev-libs/rocclr/files')

diff --git a/dev-libs/rocclr/files/rocclr-3.5.0-cmake-install-destination.patch b/dev-libs/rocclr/files/rocclr-3.5.0-cmake-install-destination.patch
deleted file mode 100644
index 4f915284f627..000000000000
--- a/dev-libs/rocclr/files/rocclr-3.5.0-cmake-install-destination.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/CMakeLists.txt	2020-06-07 13:12:46.497062447 +0200
-+++ b/CMakeLists.txt	2020-06-07 13:13:44.401062226 +0200
-@@ -202,40 +202,40 @@
- #endif()
- endif()
- 
--install( TARGETS amdrocclr_static ARCHIVE DESTINATION lib LIBRARY DESTINATION lib COMPONENT applications)
-+install( TARGETS amdrocclr_static ARCHIVE DESTINATION lib64 LIBRARY DESTINATION lib64 COMPONENT applications)
- file(GLOB headerfiles "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
- install (
-     FILES ${headerfiles}
--    DESTINATION include)
-+    DESTINATION include/rocclr)
- install (
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include"
--   DESTINATION include
-+   DESTINATION include/rocclr
-    FILES_MATCHING PATTERN "*.h*")
- 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*")
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
deleted file mode 100644
index fc9bacee5020..000000000000
--- a/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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}.")
- 
- 
- 
-- 
cgit v1.2.3