1 |
commit: 1d2b6d182c6d7945ec5166803ca071f640ad994b |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 6 14:45:05 2022 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 6 14:48:15 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d2b6d18 |
7 |
|
8 |
dev-libs/rocr-runtime: drop proprietary AQLProfile. |
9 |
|
10 |
Patch out the error messages. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/716948 |
13 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
14 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
15 |
|
16 |
.../files/rocr-runtime-4.3.0_no-sqlprofiler.patch | 29 ++++++++++++++++++++++ |
17 |
dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild | 4 ++- |
18 |
2 files changed, 32 insertions(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-sqlprofiler.patch b/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-sqlprofiler.patch |
21 |
new file mode 100644 |
22 |
index 000000000000..fdb34b75b2d2 |
23 |
--- /dev/null |
24 |
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-sqlprofiler.patch |
25 |
@@ -0,0 +1,29 @@ |
26 |
+Index: ROCR-Runtime-rocm-4.3.0/src/core/runtime/amd_gpu_agent.cpp |
27 |
+=================================================================== |
28 |
+--- src/core/runtime/amd_gpu_agent.cpp |
29 |
++++ src/core/runtime/amd_gpu_agent.cpp |
30 |
+@@ -861,11 +861,6 @@ hsa_status_t GpuAgent::GetInfo(hsa_agent |
31 |
+ setFlag(HSA_EXTENSION_IMAGES); |
32 |
+ } |
33 |
+ |
34 |
+- if (os::LibHandle lib = os::LoadLib(kAqlProfileLib)) { |
35 |
+- os::CloseLib(lib); |
36 |
+- setFlag(HSA_EXTENSION_AMD_AQLPROFILE); |
37 |
+- } |
38 |
+- |
39 |
+ setFlag(HSA_EXTENSION_AMD_PROFILER); |
40 |
+ |
41 |
+ break; |
42 |
+Index: ROCR-Runtime-rocm-4.3.0/src/core/runtime/hsa.cpp |
43 |
+=================================================================== |
44 |
+--- src/core/runtime/hsa.cpp |
45 |
++++ src/core/runtime/hsa.cpp |
46 |
+@@ -471,7 +471,7 @@ hsa_status_t hsa_system_get_major_extens |
47 |
+ return HSA_STATUS_SUCCESS; |
48 |
+ } |
49 |
+ |
50 |
+- if (extension == HSA_EXTENSION_AMD_AQLPROFILE) { |
51 |
++ if (0) { |
52 |
+ if (version_major != hsa_ven_amd_aqlprofile_VERSION_MAJOR) { |
53 |
+ debug_print("aqlprofile API incompatible ver %d, current ver %d\n", |
54 |
+ version_major, hsa_ven_amd_aqlprofile_VERSION_MAJOR); |
55 |
|
56 |
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild |
57 |
index c1f5f5a3a07b..2be1fb23feb6 100644 |
58 |
--- a/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild |
59 |
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild |
60 |
@@ -1,4 +1,4 @@ |
61 |
-# Copyright 1999-2021 Gentoo Authors |
62 |
+# Copyright 1999-2022 Gentoo Authors |
63 |
# Distributed under the terms of the GNU General Public License v2 |
64 |
|
65 |
EAPI=7 |
66 |
@@ -33,6 +33,8 @@ DEPEND="${COMMON_DEPEND} |
67 |
BDEPEND="app-editors/vim-core" |
68 |
# vim-core is needed for "xxd" |
69 |
|
70 |
+PATCHES=( "${FILESDIR}"/${PN}-4.3.0_no-sqlprofiler.patch ) |
71 |
+ |
72 |
src_prepare() { |
73 |
# ... otherwise system llvm/clang is used ... |
74 |
sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die |