commit: 8841a673aeb54b8801671d7cc9cb0ebf3fca69cb Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Tue Aug 25 21:02:54 2020 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Tue Aug 25 21:08:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8841a673
dev-libs/rocm-comgr: Cleanup old versions Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> dev-libs/rocm-comgr/Manifest | 4 -- .../files/rocm-comgr-2.6.0-find-clang.patch | 26 ------- .../files/rocm-comgr-2.6.0-find-lld-includes.patch | 43 ----------- .../files/rocm-comgr-2.8.0-dependencies.patch | 84 ---------------------- dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild | 41 ----------- dev-libs/rocm-comgr/rocm-comgr-3.1.0.ebuild | 41 ----------- dev-libs/rocm-comgr/rocm-comgr-3.3.0.ebuild | 41 ----------- dev-libs/rocm-comgr/rocm-comgr-3.5.0.ebuild | 41 ----------- 8 files changed, 321 deletions(-) diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest index eb602155f7a..f5bcffb66d9 100644 --- a/dev-libs/rocm-comgr/Manifest +++ b/dev-libs/rocm-comgr/Manifest @@ -1,5 +1 @@ -DIST rocm-comgr-3.0.0.tar.gz 88594 BLAKE2B d3fb356962ba6a9ffc7aa295f1582f6587d55d1f4f2a9a978f5c189f4a0597a9cb3f9806a1f2f43f14e262bc19964e06f41df3c7f45ac3c1579511fe235cc940 SHA512 ffa250c44388b1985ec0dac68bf0dd27820933fe7579f7fc6b35d783852cd03fb02919b5e800b01d536c36eb3c5bff96d1a38f5c8ab6380d6584b2e6d19a25fc -DIST rocm-comgr-3.1.0.tar.gz 88654 BLAKE2B 2b74fcde11a9fdd815526cb6fae81c1844aed5d73e961c437c9d3585b8cbd538983a9b06a5130eb75e5ac272d0a833f459053436f48116eb430c742de532ce65 SHA512 be148e92c84aacfc11724b0bfb54fab0e8cec2474eb943b1df4841517d47a3995b179afafcaa0730ddb9fadf891ca4797ce6613afac1f6f018dcc5b030a32e98 -DIST rocm-comgr-3.3.0.tar.gz 88792 BLAKE2B e84d63c0462bd64a7f10a6092d736811e834c6541aea2ee6363b60e7ab5652dc3efee16ae353dbc7ddeca343f7ce2d41b381cdd722dc98d7c9e9f2c43d4ff25f SHA512 681656f87639c1a1893e073738c253d5a0a63c23d8555e59950828c0a3d7ed997b0a70d827aae6e0af6a465a433acd0e82dd921bd12b9df31628f53ea83754a9 -DIST rocm-comgr-3.5.0.tar.gz 89330 BLAKE2B 463b5a7fed9588a87308ef7b8ad52a25000baf53556022b68c666dfd41d9d89877bb392aaf58de947b35bfae74b13ca06ae6f3770ef689c612e31318ebb9d981 SHA512 8f4b702976f31e2221ed0a545ffe028fecb268b3939b8e13b8f321786dc63398e5715ecb1910c0ca671454702dcc3671d518cc458c5a02e8cc63a90d029ca569 DIST rocm-comgr-3.7.0.tar.gz 94875 BLAKE2B 0d6b01360cbdb4a40aab9dadcc56389a3edc11380fe1c39a29a9f3c0356708ae95ce8918bf9d4d4fa46c1a077a2daf99c5bad65906d24ea4948de93e1d4d0280 SHA512 62a08b286313234c4c3226872a410afe9818c829fb3424f4c2a464f759d8d3c6a701de4a89ea21fe6ac2b9620cec0a44c04dd5a793ba30a0537ed3ddf86fff46 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 dda005ab7a2..00000000000 --- 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 <candr...@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 5b44feaf1b3..00000000000 --- 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 <candr...@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 3a0af258c05..00000000000 --- 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 <candr...@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 <candr...@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 diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild deleted file mode 100644 index 4eeaffa1c91..00000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"; - inherit git-r3 - S="${WORKDIR}/${P}/lib/comgr" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr" - KEYWORDS="~amd64" -fi -PATCHES=( - "${FILESDIR}/${PN}-2.6.0-find-clang.patch" - "${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch" - "${FILESDIR}/${PN}-2.8.0-dependencies.patch" -) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"; -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - >=sys-devel/llvm-roc-${PV}:=" -DEPEND="${RDEPEND}" - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/" - ) - cmake_src_configure -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.1.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.1.0.ebuild deleted file mode 100644 index 96891e69855..00000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-3.1.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"; - inherit git-r3 - S="${WORKDIR}/${P}/lib/comgr" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr" - KEYWORDS="~amd64" -fi -PATCHES=( - "${FILESDIR}/${PN}-2.6.0-find-clang.patch" - "${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch" - "${FILESDIR}/${PN}-3.1.0-dependencies.patch" -) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"; -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - >=sys-devel/llvm-roc-${PV}:=" -DEPEND="${RDEPEND}" - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/" - ) - cmake_src_configure -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.3.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.3.0.ebuild deleted file mode 100644 index 0c08627ebd8..00000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-3.3.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"; - inherit git-r3 - S="${WORKDIR}/${P}/lib/comgr" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr" - KEYWORDS="~amd64" -fi -PATCHES=( - "${FILESDIR}/${PN}-2.6.0-find-clang.patch" - "${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch" - "${FILESDIR}/${PN}-3.1.0-dependencies.patch" -) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"; -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - >=sys-devel/llvm-roc-${PV}:=" -DEPEND="${RDEPEND}" - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/" - ) - cmake_src_configure -} diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.5.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.5.0.ebuild deleted file mode 100644 index 097011983ea..00000000000 --- a/dev-libs/rocm-comgr/rocm-comgr-3.5.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"; - inherit git-r3 - S="${WORKDIR}/${P}/lib/comgr" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr" - KEYWORDS="~amd64" -fi - -PATCHES=( - "${FILESDIR}/${PN}-3.1.0-dependencies.patch" -) - -DESCRIPTION="Radeon Open Compute Code Object Manager" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"; -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -RDEPEND=">=dev-libs/rocm-device-libs-${PV} - >=sys-devel/llvm-roc-${PV}:=" -DEPEND="${RDEPEND}" - -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm" - -DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang" - ) - cmake_src_configure -}
