summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@gentoo.org>2020-08-25 17:02:54 -0400
committerCraig Andrews <candrews@gentoo.org>2020-08-25 17:08:06 -0400
commit8841a673aeb54b8801671d7cc9cb0ebf3fca69cb (patch)
tree152389eb9587d06da72e49330b72e1d800b66130 /dev-libs/rocm-comgr/files
parentdev-libs/rocm-device-libs: Cleanup old versions (diff)
downloadgentoo-8841a673aeb54b8801671d7cc9cb0ebf3fca69cb.tar.gz
gentoo-8841a673aeb54b8801671d7cc9cb0ebf3fca69cb.tar.bz2
gentoo-8841a673aeb54b8801671d7cc9cb0ebf3fca69cb.zip
dev-libs/rocm-comgr: Cleanup old versions
Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Craig Andrews <candrews@gentoo.org>
Diffstat (limited to 'dev-libs/rocm-comgr/files')
-rw-r--r--dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch26
-rw-r--r--dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch43
-rw-r--r--dev-libs/rocm-comgr/files/rocm-comgr-2.8.0-dependencies.patch84
3 files changed, 0 insertions, 153 deletions
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch
deleted file mode 100644
index dda005ab7a21..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-clang.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/16
-
-From 09eb70afa22e2d6066a5f29888158c6005170ca6 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Wed, 31 Jul 2019 10:13:30 -0400
-Subject: [PATCH] Find Clang avoiding the system (non-ROC) LLVM
-
-Use NO_DEFAULT_PATH to avoid finding the system (non-ROC) LLVM.
-Use /opt/rocm/llvm as an additional hint to be consistent with the build systems of other ROC projects (such as ROCm-OpenCL-Driver)
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 454b830..8642c98 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,7 +13,7 @@ endif()
-
- project(code_object_manager)
-
--find_package(Clang REQUIRED CONFIG)
-+find_package(Clang REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm" NO_DEFAULT_PATH)
- add_definitions(${LLVM_DEFINITIONS})
- include_directories(${LLVM_INCLUDE_DIRS})
- link_directories(${LLVM_LIBRARY_DIRS})
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch
deleted file mode 100644
index 5b44feaf1b3d..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-find-lld-includes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/17
-
-From 4588c1a5aad3edae9d3e121685d8d1f5fddd54ba Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Wed, 31 Jul 2019 10:45:01 -0400
-Subject: [PATCH] Find lld includes in LLVM_INCLUDE_DIRS
-
-Allows building against an LLVM build tree
----
- CMakeLists.txt | 20 ++------------------
- 1 file changed, 2 insertions(+), 18 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 454b830..db28533 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,24 +19,8 @@ include_directories(${LLVM_INCLUDE_DIRS})
- link_directories(${LLVM_LIBRARY_DIRS})
- include_directories(${CLANG_INCLUDE_DIRS})
-
--# FIXME: There is no way to directly determine the include paths for LLD when
--# working with an LLVM build tree, but we want to avoid having to install LLVM
--# to build Comgr. This should eventually be fixed in usptream LLD so this can
--# be removed.
--if(DEFINED LLVM_BUILD_MAIN_SRC_DIR)
-- set(INTERNAL_LLD_INCLUDE_DIRS "${LLVM_BUILD_MAIN_SRC_DIR}/tools/lld/include")
-- set(EXTERNAL_LLD_INCLUDE_DIRS "${LLVM_BUILD_MAIN_SRC_DIR}/../lld/include")
-- if (EXISTS "${INTERNAL_LLD_INCLUDE_DIRS}"
-- AND IS_DIRECTORY "${INTERNAL_LLD_INCLUDE_DIRS}")
-- set(LLD_INCLUDE_DIRS "${INTERNAL_LLD_INCLUDE_DIRS}")
-- elseif (EXISTS "${EXTERNAL_LLD_INCLUDE_DIRS}"
-- AND IS_DIRECTORY "${EXTERNAL_LLD_INCLUDE_DIRS}")
-- set(LLD_INCLUDE_DIRS "${EXTERNAL_LLD_INCLUDE_DIRS}")
-- else()
-- message(FATAL_ERROR "You are attempting to compile using an LLVM build tree, but the LLD include directory could not be located. The paths '${INTERNAL_LLD_INCLUDE_DIRS}' and '${EXTERNAL_LLD_INCLUDE_DIRS}' were tried.")
-- endif()
-- include_directories(${LLD_INCLUDE_DIRS})
--endif()
-+set(LLD_INCLUDE_DIRS "${LLVM_INCLUDE_DIRS}/lld")
-+include_directories(${LLD_INCLUDE_DIRS})
-
- find_package(AMDDeviceLibs CONFIG)
-
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.8.0-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.8.0-dependencies.patch
deleted file mode 100644
index 3a0af258c054..000000000000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.8.0-dependencies.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19
-
-From 5f872ae4a059ac6a09669e301b8a60b11a25eb42 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Wed, 31 Jul 2019 11:51:17 -0400
-Subject: [PATCH 1/2] Link additional required LLVM libraries
-
-Without these additional required dependencies, linking fails with errors such as:
-`undefined reference to `llvm::errs()'`
----
- CMakeLists.txt | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 454b830..95e5799 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -185,7 +185,11 @@ add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
- include_directories(./yaml-cpp/include)
-
- set(CLANG_LIBS
-- clangFrontendTool)
-+ clangFrontendTool
-+ clangFrontend
-+ clangBasic
-+ clangDriver
-+ clangSerialization)
-
- set(LLD_LIBS
- lldELF
-@@ -193,8 +197,19 @@ set(LLD_LIBS
-
- llvm_map_components_to_libnames(LLVM_LIBS
- ${LLVM_TARGETS_TO_BUILD}
-+ Option
- DebugInfoDWARF
-- Symbolize)
-+ Symbolize
-+ Support
-+ Object
-+ BitWriter
-+ MC
-+ MCParser
-+ MCDisassembler
-+ Core
-+ IRReader
-+ CodeGen
-+ Linker)
-
- target_link_libraries(amd_comgr
- PUBLIC
-
-From ffc4d18a7ae1fbd5c8807eec4ca8aed043524811 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Mon, 30 Sep 2019 10:52:12 -0400
-Subject: [PATCH 2/2] Link more required LLVM libraries
-
-Without these additional required dependencies, linking fails with errors such as:
-```
-in function `amd_comgr_index_list_metadata':
-<artificial>:(.text+0x4d4c): undefined reference to `llvm::msgpack::ArrayDocNode::operator[](unsigned long)'
-```
-and
-```
-undefined reference to `llvm::msgpack::Document::fromYAML(llvm::StringRef)'
-```
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 95e5799..b6123a6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -209,7 +209,8 @@ llvm_map_components_to_libnames(LLVM_LIBS
- Core
- IRReader
- CodeGen
-- Linker)
-+ Linker
-+ BinaryFormat)
-
- target_link_libraries(amd_comgr
- PUBLIC