1 |
commit: 3b9ae6bac044f6115bf35f42c44cc9f7b2fe0344 |
2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 30 15:07:28 2019 +0000 |
4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 30 15:07:28 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9ae6ba |
7 |
|
8 |
dev-libs/rocm-comgr: 2.8.0 version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
11 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
12 |
|
13 |
dev-libs/rocm-comgr/Manifest | 1 + |
14 |
.../files/rocm-comgr-2.8.0-dependencies.patch | 84 ++++++++++++++++++++++ |
15 |
dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild | 42 +++++++++++ |
16 |
3 files changed, 127 insertions(+) |
17 |
|
18 |
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest |
19 |
index 0133d5015d7..d53d3bee114 100644 |
20 |
--- a/dev-libs/rocm-comgr/Manifest |
21 |
+++ b/dev-libs/rocm-comgr/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST rocm-comgr-2.6.0.tar.gz 1484343 BLAKE2B fcb496b4997d672640e3f75622e74085eeb9dfe83c88ae025530389d3cdca7628155168060e71f7a3ff915e933ffe70c7026720dc124d128d16ef4df397525e7 SHA512 b14e90603d2b6e17f6b0335ea35da2e5d7e31710f301d7a7f7751a45d996e3dbbfbf84a03e2e911e8798e72e77b87b5cd88317e897cb4de3ee5cf0e7c3222d68 |
24 |
DIST rocm-comgr-2.7.0.tar.gz 1500771 BLAKE2B 275ad4cab34d554f8a131101eda474926f7270a44a0af9941d8f1233c29b44b3efb3ba83c6b541d501a3e2fc751c591c0f6a993563bbacf539b5bcd04b23963b SHA512 afb4a7318c2e137db6ac0502041ed53e63783ec1ab458962b1b16f0f2f28e09ce2ae70d048b858740eca8bf06328858400a68bed4e91d7cfc4b7714a66d85bc9 |
25 |
+DIST rocm-comgr-2.8.0.tar.gz 85502 BLAKE2B 14e18191a475c3d05e324f15e3b2d0829eed56bfa625b48e217e6540836e005675a4ffdd0813664c7f61177431d0987499eb9a75ec83acfa0e554e954770fbc9 SHA512 516832f2a1be5e66d93dddfd1275861605afcb6e3410cb518e6d8647a25c18da058e37cbce8434d5b7133a2147c8c84dc48a485f7b855b74a3b49c9f7dae4a0e |
26 |
|
27 |
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 |
28 |
new file mode 100644 |
29 |
index 00000000000..3a0af258c05 |
30 |
--- /dev/null |
31 |
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.8.0-dependencies.patch |
32 |
@@ -0,0 +1,84 @@ |
33 |
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19 |
34 |
+ |
35 |
+From 5f872ae4a059ac6a09669e301b8a60b11a25eb42 Mon Sep 17 00:00:00 2001 |
36 |
+From: Craig Andrews <candrews@××××××××××××.com> |
37 |
+Date: Wed, 31 Jul 2019 11:51:17 -0400 |
38 |
+Subject: [PATCH 1/2] Link additional required LLVM libraries |
39 |
+ |
40 |
+Without these additional required dependencies, linking fails with errors such as: |
41 |
+`undefined reference to `llvm::errs()'` |
42 |
+--- |
43 |
+ CMakeLists.txt | 19 +++++++++++++++++-- |
44 |
+ 1 file changed, 17 insertions(+), 2 deletions(-) |
45 |
+ |
46 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
47 |
+index 454b830..95e5799 100644 |
48 |
+--- a/CMakeLists.txt |
49 |
++++ b/CMakeLists.txt |
50 |
+@@ -185,7 +185,11 @@ add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL) |
51 |
+ include_directories(./yaml-cpp/include) |
52 |
+ |
53 |
+ set(CLANG_LIBS |
54 |
+- clangFrontendTool) |
55 |
++ clangFrontendTool |
56 |
++ clangFrontend |
57 |
++ clangBasic |
58 |
++ clangDriver |
59 |
++ clangSerialization) |
60 |
+ |
61 |
+ set(LLD_LIBS |
62 |
+ lldELF |
63 |
+@@ -193,8 +197,19 @@ set(LLD_LIBS |
64 |
+ |
65 |
+ llvm_map_components_to_libnames(LLVM_LIBS |
66 |
+ ${LLVM_TARGETS_TO_BUILD} |
67 |
++ Option |
68 |
+ DebugInfoDWARF |
69 |
+- Symbolize) |
70 |
++ Symbolize |
71 |
++ Support |
72 |
++ Object |
73 |
++ BitWriter |
74 |
++ MC |
75 |
++ MCParser |
76 |
++ MCDisassembler |
77 |
++ Core |
78 |
++ IRReader |
79 |
++ CodeGen |
80 |
++ Linker) |
81 |
+ |
82 |
+ target_link_libraries(amd_comgr |
83 |
+ PUBLIC |
84 |
+ |
85 |
+From ffc4d18a7ae1fbd5c8807eec4ca8aed043524811 Mon Sep 17 00:00:00 2001 |
86 |
+From: Craig Andrews <candrews@××××××××××××.com> |
87 |
+Date: Mon, 30 Sep 2019 10:52:12 -0400 |
88 |
+Subject: [PATCH 2/2] Link more required LLVM libraries |
89 |
+ |
90 |
+Without these additional required dependencies, linking fails with errors such as: |
91 |
+``` |
92 |
+in function `amd_comgr_index_list_metadata': |
93 |
+<artificial>:(.text+0x4d4c): undefined reference to `llvm::msgpack::ArrayDocNode::operator[](unsigned long)' |
94 |
+``` |
95 |
+and |
96 |
+``` |
97 |
+undefined reference to `llvm::msgpack::Document::fromYAML(llvm::StringRef)' |
98 |
+``` |
99 |
+--- |
100 |
+ CMakeLists.txt | 3 ++- |
101 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
102 |
+ |
103 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
104 |
+index 95e5799..b6123a6 100644 |
105 |
+--- a/CMakeLists.txt |
106 |
++++ b/CMakeLists.txt |
107 |
+@@ -209,7 +209,8 @@ llvm_map_components_to_libnames(LLVM_LIBS |
108 |
+ Core |
109 |
+ IRReader |
110 |
+ CodeGen |
111 |
+- Linker) |
112 |
++ Linker |
113 |
++ BinaryFormat) |
114 |
+ |
115 |
+ target_link_libraries(amd_comgr |
116 |
+ PUBLIC |
117 |
|
118 |
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild |
119 |
new file mode 100644 |
120 |
index 00000000000..ff0ede91ae2 |
121 |
--- /dev/null |
122 |
+++ b/dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild |
123 |
@@ -0,0 +1,42 @@ |
124 |
+# Copyright 1999-2019 Gentoo Authors |
125 |
+# Distributed under the terms of the GNU General Public License v2 |
126 |
+ |
127 |
+EAPI=7 |
128 |
+ |
129 |
+inherit cmake-utils |
130 |
+ |
131 |
+if [[ ${PV} == *9999 ]] ; then |
132 |
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/" |
133 |
+ inherit git-r3 |
134 |
+ S="${WORKDIR}/${P}/lib/comgr" |
135 |
+else |
136 |
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" |
137 |
+ S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr" |
138 |
+ KEYWORDS="~amd64" |
139 |
+fi |
140 |
+PATCHES=( |
141 |
+ "${FILESDIR}/${PN}-2.6.0-find-clang.patch" |
142 |
+ "${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch" |
143 |
+ "${FILESDIR}/${PN}-2.8.0-dependencies.patch" |
144 |
+) |
145 |
+ |
146 |
+DESCRIPTION="Radeon Open Compute Code Object Manager" |
147 |
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" |
148 |
+LICENSE="MIT" |
149 |
+SLOT="0/$(ver_cut 1-2)" |
150 |
+ |
151 |
+RDEPEND=">=dev-libs/rocm-device-libs-${PV} |
152 |
+ >=sys-devel/llvm-roc-${PV}:=" |
153 |
+DEPEND="${RDEPEND}" |
154 |
+ |
155 |
+src_prepare() { |
156 |
+ cmake-utils_src_prepare |
157 |
+} |
158 |
+ |
159 |
+src_configure() { |
160 |
+ local mycmakeargs=( |
161 |
+ -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/" |
162 |
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/" |
163 |
+ ) |
164 |
+ cmake-utils_src_configure |
165 |
+} |