Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/, dev-util/roctracer/files/
Date: Sun, 01 May 2022 14:44:03
Message-Id: 1651416229.d781014aad6aa8ecf7af866458427b2ef208ff4d.heroxbd@gentoo
1 commit: d781014aad6aa8ecf7af866458427b2ef208ff4d
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 1 14:41:18 2022 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Sun May 1 14:43:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d781014a
7
8 dev-util/roctracer: version bump to 5.0.2.
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
12
13 dev-util/roctracer/Manifest | 2 +
14 .../roctracer/files/roctracer-5.0.2-Werror.patch | 18 ++++++
15 .../roctracer/files/roctracer-5.0.2-headers.patch | 36 +++++++++++
16 .../files/roctracer-5.0.2-strip-license.patch | 14 +++++
17 dev-util/roctracer/roctracer-5.0.2.ebuild | 69 ++++++++++++++++++++++
18 5 files changed, 139 insertions(+)
19
20 diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
21 index c0dab991cddc..9c8b51497026 100644
22 --- a/dev-util/roctracer/Manifest
23 +++ b/dev-util/roctracer/Manifest
24 @@ -1,5 +1,7 @@
25 DIST rocm-tracer-4.0.0.tar.gz 462166 BLAKE2B 1294b5639a743a9d32737c72dc0f082b5a33ee1b3365f48221ad6392cdde7637926c42ea344fa96e9fc8410ea04e9ce3f535e188a25130f4be764c4d4a59b69c SHA512 312cd6c4c98a83e28a9f8b9e6123862af2e80a0d0852acff11be65d198f277c6ea194e72f6dbaccab1dd5d4af318bef28ca546e49440f22d024a546a4e5e9e15
26 DIST rocm-tracer-4.2.0.tar.gz 476974 BLAKE2B 3a7be9c269fec5dcca98d7de514d97a2e1de7bbfaa54a1aca2df70453d05326564c8ee7bf793c7d176069ecd3f7f91409c6a20dd0773aa157f7abc1dac41448e SHA512 002d9fccee4761af4853e589b116bc5844b98abb84517c260aedcb5f31f5c92b862a233062ec280a6f878343c4f751d55f47fd38483e1882feb8c970f9836120
27 DIST rocm-tracer-4.3.0.tar.gz 477647 BLAKE2B d597df2efef0c750637c8f509b89ad62927cb839ba7c9a42fa71882ee13d4a0bba295af19b02eda5310421e53187e9a98a76777f0d3a587e7e652ecf4c10cb6a SHA512 47ea2705a361cb863f33a9f4c1a7d5005bb679221fa95f14dd5404ef5af32377bad5c7d9807e2fff8030a9c26ac4230f2bab833344ef49ecebbd5653f0edfc2c
28 +DIST rocm-tracer-5.0.2.tar.gz 474669 BLAKE2B b350111590140e1282338e4f134caf6228677c49361ceb9bc7ba0da8709346daa4fd014644c04adff0e903dba6014a84edd2eb3a5c132a8f91b479e4d5b085e5 SHA512 3fc1449cc9c9bf83e5233a7a0e83c0e3fa9da225d5ee4427b7d6fa15e3580497e1b9fbcd63892e4a99df01582aecd3ccfd66d2a19af2d8c25949ee705894ea44
29 DIST rocprofiler-4.2.0.tar.gz 1408433 BLAKE2B b35a7710d680167bad78ff74be153ea994ea919d572c5091ecec73d614bebb7ec14a14d81a0cabbe514b8439ddd7225f1a3a3fa7a0b653c33f938568bbe0c593 SHA512 35d3e9648bc5ee60bbddc15c9675efba7de3b4b3b725b9623e71a83007b8f23a323cc1da82e67f0ff425e5f827d6c632435bf465be8cba8c775405ead3f0f3be
30 DIST rocprofiler-4.3.0.tar.gz 1402250 BLAKE2B 3826c3b26b0d5838ab3475614c2ecd2265e177fe40b8a90abb491746513bd50841e5ceb34d1fcb4bcb2fbe8a6854b9715d0670d38f08775e5e14cd855f15629b SHA512 e327146604459f2f827ab943a21d0eaa0ee41cf6770ab94dd019d461cf6438e70a48139ce67ec1553d0f450fa5bb233a7ed39438e8bf39b33218d53e2c270d3b
31 +DIST rocprofiler-5.0.2.tar.gz 1401732 BLAKE2B ae870bc50dbd39c11e24f77ccb41773df1107b76cb7a12e1cebc66f8d66ddba6ad3bd6f9fe61657b03b22ef35f88fb608cf6070178f6aab24fe7a1bdcac43a96 SHA512 244e2b827126b7299ec0510daa5e1245a4a5a877394419f8bc9113f443231f67fc935609cbde6eeb26bb138ab4e95e2a88829ffa79ecc8f9881b5a77b5910c02
32
33 diff --git a/dev-util/roctracer/files/roctracer-5.0.2-Werror.patch b/dev-util/roctracer/files/roctracer-5.0.2-Werror.patch
34 new file mode 100644
35 index 000000000000..ddcfd7d669df
36 --- /dev/null
37 +++ b/dev-util/roctracer/files/roctracer-5.0.2-Werror.patch
38 @@ -0,0 +1,18 @@
39 +User code should not use the aggressive warning and error flags.
40 +
41 +Index: roctracer-rocm-5.0.2/cmake_modules/env.cmake
42 +===================================================================
43 +--- roctracer-rocm-5.0.2.orig/cmake_modules/env.cmake
44 ++++ roctracer-rocm-5.0.2/cmake_modules/env.cmake
45 +@@ -39,10 +39,8 @@ add_definitions ( -D__HIP_PLATFORM_HCC__
46 +
47 + ## Linux Compiler options
48 + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
49 +-set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )
50 +-set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
51 +-set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type" )
52 + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
53 ++set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive" )
54 + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden" )
55 + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-math-errno" )
56 + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-threadsafe-statics" )
57
58 diff --git a/dev-util/roctracer/files/roctracer-5.0.2-headers.patch b/dev-util/roctracer/files/roctracer-5.0.2-headers.patch
59 new file mode 100644
60 index 000000000000..91e48892bc45
61 --- /dev/null
62 +++ b/dev-util/roctracer/files/roctracer-5.0.2-headers.patch
63 @@ -0,0 +1,36 @@
64 +do not install a second set of header files, strip package name from
65 +libraries and headers.
66 +
67 +Index: roctracer-rocm-5.0.2/CMakeLists.txt
68 +===================================================================
69 +--- roctracer-rocm-5.0.2.orig/CMakeLists.txt
70 ++++ roctracer-rocm-5.0.2/CMakeLists.txt
71 +@@ -131,16 +131,12 @@ add_custom_target ( so-patch-link ALL WO
72 + COMMAND ${CMAKE_COMMAND} -E create_symlink ../${DEST_NAME}/lib/${ROCTRACER_LIBRARY}.so.${LIB_VERSION_STRING} so-patch-link )
73 +
74 + ## Install information
75 +-install ( TARGETS ${ROCTRACER_TARGET} LIBRARY DESTINATION ${DEST_NAME}/lib )
76 ++install ( TARGETS ${ROCTRACER_TARGET} LIBRARY DESTINATION lib )
77 + foreach ( header ${PUBLIC_HEADERS} )
78 +- get_filename_component ( header_subdir ${header} DIRECTORY )
79 +- install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/${header} DESTINATION ${DEST_NAME}/include/${header_subdir} )
80 +- install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/${header} DESTINATION include/${DEST_NAME}/${header_subdir} )
81 ++ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/${header} DESTINATION include )
82 + endforeach ()
83 + foreach ( header ${GEN_HEADERS} )
84 +- get_filename_component ( header_subdir ${header} DIRECTORY )
85 +- install ( FILES ${PROJECT_BINARY_DIR}/inc/${header} DESTINATION ${DEST_NAME}/include/${header_subdir} )
86 +- install ( FILES ${PROJECT_BINARY_DIR}/inc/${header} DESTINATION include/${DEST_NAME}/${header_subdir} )
87 ++ install ( FILES ${PROJECT_BINARY_DIR}/inc/${header} DESTINATION include )
88 + endforeach ()
89 + #install ( FILES ${PROJECT_BINARY_DIR}/inc-link DESTINATION include RENAME ${DEST_NAME} )
90 + install ( FILES ${PROJECT_BINARY_DIR}/so-link DESTINATION lib RENAME ${ROCTRACER_LIBRARY}.so )
91 +@@ -162,7 +158,7 @@ add_custom_target ( so-roctx-major-link
92 + add_custom_target ( so-roctx-patch-link ALL WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
93 + COMMAND ${CMAKE_COMMAND} -E create_symlink ../${DEST_NAME}/lib/${ROCTX_LIBRARY}.so.${LIB_VERSION_STRING} so-roctx-patch-link )
94 +
95 +-install ( TARGETS "roctx64" LIBRARY DESTINATION ${DEST_NAME}/lib )
96 ++install ( TARGETS "roctx64" LIBRARY DESTINATION lib )
97 + install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so )
98 + install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-major-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so.${LIB_VERSION_MAJOR} )
99 + install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-patch-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so.${LIB_VERSION_STRING} )
100
101 diff --git a/dev-util/roctracer/files/roctracer-5.0.2-strip-license.patch b/dev-util/roctracer/files/roctracer-5.0.2-strip-license.patch
102 new file mode 100644
103 index 000000000000..e9c33885a01c
104 --- /dev/null
105 +++ b/dev-util/roctracer/files/roctracer-5.0.2-strip-license.patch
106 @@ -0,0 +1,14 @@
107 +Index: roctracer-rocm-5.0.2/CMakeLists.txt
108 +===================================================================
109 +--- roctracer-rocm-5.0.2.orig/CMakeLists.txt
110 ++++ roctracer-rocm-5.0.2/CMakeLists.txt
111 +@@ -173,9 +173,6 @@ set ( CPACK_PACKAGE_CONTACT "ROCm Profil
112 + set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMD ROCTRACER library" )
113 + set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" )
114 +
115 +-# Install license file
116 +-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION share/doc/${CPACK_PACKAGE_NAME})
117 +-
118 + ## Debian package specific variables
119 + if ( DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE} )
120 + set ( CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE} )
121
122 diff --git a/dev-util/roctracer/roctracer-5.0.2.ebuild b/dev-util/roctracer/roctracer-5.0.2.ebuild
123 new file mode 100644
124 index 000000000000..7c53e956e347
125 --- /dev/null
126 +++ b/dev-util/roctracer/roctracer-5.0.2.ebuild
127 @@ -0,0 +1,69 @@
128 +# Copyright 1999-2022 Gentoo Authors
129 +# Distributed under the terms of the GNU General Public License v2
130 +
131 +EAPI=7
132 +
133 +PYTHON_COMPAT=( python3_{8,9} )
134 +
135 +inherit cmake prefix python-any-r1
136 +
137 +DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
138 +HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
139 +SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz
140 + https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz"
141 +S="${WORKDIR}/roctracer-rocm-${PV}"
142 +
143 +LICENSE="MIT"
144 +SLOT="0/$(ver_cut 1-2)"
145 +KEYWORDS="~amd64"
146 +
147 +RDEPEND="dev-libs/rocr-runtime:${SLOT}
148 + dev-util/hip:${SLOT}"
149 +DEPEND="${RDEPEND}"
150 +BDEPEND="
151 + $(python_gen_any_dep '
152 + dev-python/CppHeaderParser[${PYTHON_USEDEP}]
153 + dev-python/ply[${PYTHON_USEDEP}]
154 + ')
155 +"
156 +
157 +PATCHES=(
158 + # https://github.com/ROCm-Developer-Tools/roctracer/pull/63
159 + "${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
160 + "${FILESDIR}"/${PN}-5.0.2-Werror.patch
161 + "${FILESDIR}"/${PN}-5.0.2-headers.patch
162 + "${FILESDIR}"/${PN}-5.0.2-strip-license.patch
163 +)
164 +
165 +python_check_deps() {
166 + has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" &&
167 + has_version "dev-python/ply[${PYTHON_USEDEP}]"
168 +}
169 +
170 +src_prepare() {
171 + cmake_src_prepare
172 +
173 + mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
174 +
175 + sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
176 + -e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
177 + -e "/install ( FILES \${PROJECT_BINARY_DIR}\/so/d" \
178 + -i CMakeLists.txt || die
179 +
180 + # do not download additional sources via git
181 + sed -e "/execute_process ( COMMAND sh -xc \"if/d" \
182 + -e "/add_subdirectory ( \${HSA_TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
183 + -i test/CMakeLists.txt || die
184 +
185 + hprefixify script/*.py
186 +}
187 +
188 +src_configure() {
189 + export HIP_PATH="${EPREFIX}/usr"
190 +
191 + local mycmakeargs=(
192 + -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"
193 + )
194 +
195 + cmake_src_configure
196 +}