gentoo resync : 12.05.2022

5 files changed, 143 insertions, 0 deletions

diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index f336df38510a..6e5dda7642c2 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1,11 +1,17 @@
 AUX roctracer-3.8.0-gen_ostream_ops-toPython3.patch 1496 BLAKE2B 951878e73412f08de88e073e2f790620c4a0f97d479211668cc9eb0e1d9cb3245070df8d0a81374d2a22d6c3d68591f85c99114639fc620a8c742167eb5a5044 SHA512 7a8808b33cf2c4280e70773768b4a5997aafe8916262fb4be562d42867847e6d4600a6559955c901d0841059a1b3764c6acef5b755b61f1ee116bc9b9d7a62c0
 AUX roctracer-4.3.0-glibc-2.34.patch 993 BLAKE2B 54f25b35525da414aa3eafd48398e9e1fc28f750b08fdb0193789d6df60866c384434a79b2d52113fd29dd1e261a46f2117a89334ea6839493e33c8541516f0a SHA512 fe9f9a89220ac93a05a1b23f70a24d8522c9809afd90e6c0677d78276a8db66e9bb0d9896b5a0ad751795118cc9dfccd5743108feba027fd8123d39fc20ebc33
+AUX roctracer-5.0.2-Werror.patch 922 BLAKE2B 5644e5450de7372ee1ad6d8158a50e006f1eae666bb62652976f88d0c36b152df59ad4b7a30e98a42fa47322777ffc90edd283c3642ca260fdbd58cf697dd88f SHA512 0b37cd7432f0d9de42c2ca2e669697b782730afc10952349d47612f59122e1a5415c83b795c6ea2fb01c695263304b7e9702e45903a7177d02a48d86734ead9f
+AUX roctracer-5.0.2-headers.patch 2452 BLAKE2B b5e34ddef1e61277d01b771b59e345c3ace07ff90f7e53c0bc50d0ebb6a13e07480173ac72b216a3fb54c3af2df5c1277fdc62db7f3e028213f71a889fa725c5 SHA512 073b45703bf37c5df1ed44843b17e08d8ada0373dce5f29a21cdea1d6d7fb73563501461a2b0c33f65c70e2c99d036523d012c7787b399a785f0ded89ad60f66
+AUX roctracer-5.0.2-strip-license.patch 681 BLAKE2B b7c78ca54fb208e1d943d9f217a8d40911a98823ff1b4c58441c87fdf60297200b4d02e5fbe685fea331c3d8f87c395291c19ac2621aa90c9fb1308071e176ba SHA512 56aae25b4c24d0f9a361c10007d0e3d90960191b08e254a0f6ffef9a36fb8d17270f8bed36c36ea866da137297ab96de4e211e8c06ace7ed7444e821f0589322
 DIST rocm-tracer-4.0.0.tar.gz 462166 BLAKE2B 1294b5639a743a9d32737c72dc0f082b5a33ee1b3365f48221ad6392cdde7637926c42ea344fa96e9fc8410ea04e9ce3f535e188a25130f4be764c4d4a59b69c SHA512 312cd6c4c98a83e28a9f8b9e6123862af2e80a0d0852acff11be65d198f277c6ea194e72f6dbaccab1dd5d4af318bef28ca546e49440f22d024a546a4e5e9e15
 DIST rocm-tracer-4.2.0.tar.gz 476974 BLAKE2B 3a7be9c269fec5dcca98d7de514d97a2e1de7bbfaa54a1aca2df70453d05326564c8ee7bf793c7d176069ecd3f7f91409c6a20dd0773aa157f7abc1dac41448e SHA512 002d9fccee4761af4853e589b116bc5844b98abb84517c260aedcb5f31f5c92b862a233062ec280a6f878343c4f751d55f47fd38483e1882feb8c970f9836120
 DIST rocm-tracer-4.3.0.tar.gz 477647 BLAKE2B d597df2efef0c750637c8f509b89ad62927cb839ba7c9a42fa71882ee13d4a0bba295af19b02eda5310421e53187e9a98a76777f0d3a587e7e652ecf4c10cb6a SHA512 47ea2705a361cb863f33a9f4c1a7d5005bb679221fa95f14dd5404ef5af32377bad5c7d9807e2fff8030a9c26ac4230f2bab833344ef49ecebbd5653f0edfc2c
+DIST rocm-tracer-5.0.2.tar.gz 474669 BLAKE2B b350111590140e1282338e4f134caf6228677c49361ceb9bc7ba0da8709346daa4fd014644c04adff0e903dba6014a84edd2eb3a5c132a8f91b479e4d5b085e5 SHA512 3fc1449cc9c9bf83e5233a7a0e83c0e3fa9da225d5ee4427b7d6fa15e3580497e1b9fbcd63892e4a99df01582aecd3ccfd66d2a19af2d8c25949ee705894ea44
 DIST rocprofiler-4.2.0.tar.gz 1408433 BLAKE2B b35a7710d680167bad78ff74be153ea994ea919d572c5091ecec73d614bebb7ec14a14d81a0cabbe514b8439ddd7225f1a3a3fa7a0b653c33f938568bbe0c593 SHA512 35d3e9648bc5ee60bbddc15c9675efba7de3b4b3b725b9623e71a83007b8f23a323cc1da82e67f0ff425e5f827d6c632435bf465be8cba8c775405ead3f0f3be
 DIST rocprofiler-4.3.0.tar.gz 1402250 BLAKE2B 3826c3b26b0d5838ab3475614c2ecd2265e177fe40b8a90abb491746513bd50841e5ceb34d1fcb4bcb2fbe8a6854b9715d0670d38f08775e5e14cd855f15629b SHA512 e327146604459f2f827ab943a21d0eaa0ee41cf6770ab94dd019d461cf6438e70a48139ce67ec1553d0f450fa5bb233a7ed39438e8bf39b33218d53e2c270d3b
+DIST rocprofiler-5.0.2.tar.gz 1401732 BLAKE2B ae870bc50dbd39c11e24f77ccb41773df1107b76cb7a12e1cebc66f8d66ddba6ad3bd6f9fe61657b03b22ef35f88fb608cf6070178f6aab24fe7a1bdcac43a96 SHA512 244e2b827126b7299ec0510daa5e1245a4a5a877394419f8bc9113f443231f67fc935609cbde6eeb26bb138ab4e95e2a88829ffa79ecc8f9881b5a77b5910c02
 EBUILD roctracer-4.0.0-r1.ebuild 1572 BLAKE2B dbdbf598991d569c3bc4788d5be653678431df80f8dd5229f5be5a0dda05146ca9417d738ecae08eb6eb10f9056e09403b5289a25badddf5b24d1a863ea778fc SHA512 b4dc5f0f4b189139df9ffcc854daedb0a59547ad99156814ae50b95c888a209d2b4b4771e39599cc3bc5afb5fa44a4010d0fc77b8e80299ecd7a275b7bbf4647
 EBUILD roctracer-4.2.0-r1.ebuild 1809 BLAKE2B 11126fdae37659f3d58b0ca3d3f6d5bdc7664577d02c07966c8af50eae42779a02e944b994957123a85131227c904b3a86fc15a2471acb954eb326fac1c1f808 SHA512 bb934a99d460828da3569ebe848294a46170995faca74b3d97443f8ef193605dae5554d68cbc6749a15f0e686833897ebe9c376e415555ae0118d112c206aa5f
 EBUILD roctracer-4.3.0-r1.ebuild 2114 BLAKE2B 4261ddd8b20cb8a9ec6b650953055183d5c352e798230259c6a0f07df3ef054821cf29ca299774f4fc652f7cc048a2b88c85c3aac0385bbb33f6da05224ead76 SHA512 fe8e5a9963cb69936da43561778d0757e9f57172244af685a3bceeafcb434fd2a987e0361e51918b1b1fc7dd5a5a4527a0c26418ec61ea755d6b34a58f3ef40d
+EBUILD roctracer-5.0.2.ebuild 1917 BLAKE2B cf6baddd3de65a79a96f8b9ae3b4299a40af63bebc8ab2a1402a227d651cf9a7b8ce9bd1bbb27f25d73a033dfc6cd5eb2cb03be4a6746eed59796053d5316ea4 SHA512 bc8dc0e0168863597a08a0497df8d71a577e00e9a24334a39dc6e056b6a9e03bff4b4db87af90b06e6b3c4434885d0160917ab8a80caeeeaa945f5e5fe45db8d
 MISC metadata.xml 603 BLAKE2B b81a956c8e1b3d4bb6363919f82389ec7030baf7cd949e2ee8704543c515335acc8e497743dffeca426cefc5a89210e75b85c90f5dbc482f54f257e52f5fc77d SHA512 dcad8256b50fbed9b24458d845330756081aaef4c864ca753c074c6299a9dc0234e9dbe421e12e28548887d5ce8a07c06fc54d6942e4902d63964fb229cc734b
diff --git a/dev-util/roctracer/files/roctracer-5.0.2-Werror.patch b/dev-util/roctracer/files/roctracer-5.0.2-Werror.patch
new file mode 100644
index 000000000000..ddcfd7d669df
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.0.2-Werror.patch
@@ -0,0 +1,18 @@
+User code should not use the aggressive warning and error flags.
+
+Index: roctracer-rocm-5.0.2/cmake_modules/env.cmake
+===================================================================
+--- roctracer-rocm-5.0.2.orig/cmake_modules/env.cmake
++++ roctracer-rocm-5.0.2/cmake_modules/env.cmake
+@@ -39,10 +39,8 @@ add_definitions ( -D__HIP_PLATFORM_HCC__
+ 
+ ## Linux Compiler options
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+-set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )
+-set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
+-set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type" )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
++set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive" )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden" )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-math-errno" )
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-threadsafe-statics" )
diff --git a/dev-util/roctracer/files/roctracer-5.0.2-headers.patch b/dev-util/roctracer/files/roctracer-5.0.2-headers.patch
new file mode 100644
index 000000000000..91e48892bc45
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.0.2-headers.patch
@@ -0,0 +1,36 @@
+do not install a second set of header files, strip package name from
+libraries and headers.
+
+Index: roctracer-rocm-5.0.2/CMakeLists.txt
+===================================================================
+--- roctracer-rocm-5.0.2.orig/CMakeLists.txt
++++ roctracer-rocm-5.0.2/CMakeLists.txt
+@@ -131,16 +131,12 @@ add_custom_target ( so-patch-link ALL WO
+                     COMMAND ${CMAKE_COMMAND} -E create_symlink ../${DEST_NAME}/lib/${ROCTRACER_LIBRARY}.so.${LIB_VERSION_STRING} so-patch-link )
+ 
+ ## Install information
+-install ( TARGETS ${ROCTRACER_TARGET} LIBRARY DESTINATION ${DEST_NAME}/lib )
++install ( TARGETS ${ROCTRACER_TARGET} LIBRARY DESTINATION lib )
+ foreach ( header ${PUBLIC_HEADERS} )
+-  get_filename_component ( header_subdir ${header} DIRECTORY )
+-  install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/${header} DESTINATION ${DEST_NAME}/include/${header_subdir} )
+-  install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/${header} DESTINATION include/${DEST_NAME}/${header_subdir} )
++  install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/${header} DESTINATION include )
+ endforeach ()
+ foreach ( header ${GEN_HEADERS} )
+-  get_filename_component ( header_subdir ${header} DIRECTORY )
+-  install ( FILES ${PROJECT_BINARY_DIR}/inc/${header} DESTINATION ${DEST_NAME}/include/${header_subdir} )
+-  install ( FILES ${PROJECT_BINARY_DIR}/inc/${header} DESTINATION include/${DEST_NAME}/${header_subdir} )
++  install ( FILES ${PROJECT_BINARY_DIR}/inc/${header} DESTINATION include )
+ endforeach ()
+ #install ( FILES ${PROJECT_BINARY_DIR}/inc-link DESTINATION include RENAME ${DEST_NAME} )
+ install ( FILES ${PROJECT_BINARY_DIR}/so-link DESTINATION lib RENAME ${ROCTRACER_LIBRARY}.so )
+@@ -162,7 +158,7 @@ add_custom_target ( so-roctx-major-link
+ add_custom_target ( so-roctx-patch-link ALL WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+                     COMMAND ${CMAKE_COMMAND} -E create_symlink ../${DEST_NAME}/lib/${ROCTX_LIBRARY}.so.${LIB_VERSION_STRING} so-roctx-patch-link )
+ 
+-install ( TARGETS "roctx64" LIBRARY DESTINATION ${DEST_NAME}/lib )
++install ( TARGETS "roctx64" LIBRARY DESTINATION lib )
+ install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so )
+ install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-major-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so.${LIB_VERSION_MAJOR} )
+ install ( FILES ${PROJECT_BINARY_DIR}/so-roctx-patch-link DESTINATION lib RENAME ${ROCTX_LIBRARY}.so.${LIB_VERSION_STRING} )
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
new file mode 100644
index 000000000000..e9c33885a01c
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-5.0.2-strip-license.patch
@@ -0,0 +1,14 @@
+Index: roctracer-rocm-5.0.2/CMakeLists.txt
+===================================================================
+--- roctracer-rocm-5.0.2.orig/CMakeLists.txt
++++ roctracer-rocm-5.0.2/CMakeLists.txt
+@@ -173,9 +173,6 @@ set ( CPACK_PACKAGE_CONTACT "ROCm Profil
+ set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "AMD ROCTRACER library" )
+ set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" )
+ 
+-# Install license file
+-install(FILES ${CPACK_RESOURCE_FILE_LICENSE} DESTINATION share/doc/${CPACK_PACKAGE_NAME})
+-
+ ## Debian package specific variables
+ if ( DEFINED ENV{CPACK_DEBIAN_PACKAGE_RELEASE} )
+   set ( CPACK_DEBIAN_PACKAGE_RELEASE $ENV{CPACK_DEBIAN_PACKAGE_RELEASE} )
diff --git a/dev-util/roctracer/roctracer-5.0.2.ebuild b/dev-util/roctracer/roctracer-5.0.2.ebuild
new file mode 100644
index 000000000000..7c53e956e347
--- /dev/null
+++ b/dev-util/roctracer/roctracer-5.0.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit cmake prefix python-any-r1
+
+DESCRIPTION="Callback/Activity Library for Performance tracing AMD GPU's"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/roctracer.git"
+SRC_URI="https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-${PV}.tar.gz -> rocm-tracer-${PV}.tar.gz
+		https://github.com/ROCm-Developer-Tools/rocprofiler/archive/rocm-${PV}.tar.gz -> rocprofiler-${PV}.tar.gz"
+S="${WORKDIR}/roctracer-rocm-${PV}"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/rocr-runtime:${SLOT}
+	dev-util/hip:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep '
+	dev-python/CppHeaderParser[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	# https://github.com/ROCm-Developer-Tools/roctracer/pull/63
+	"${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
+	"${FILESDIR}"/${PN}-5.0.2-Werror.patch
+	"${FILESDIR}"/${PN}-5.0.2-headers.patch
+	"${FILESDIR}"/${PN}-5.0.2-strip-license.patch
+)
+
+python_check_deps() {
+	has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/ply[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
+
+	sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
+		-e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-e "/install ( FILES \${PROJECT_BINARY_DIR}\/so/d" \
+		-i CMakeLists.txt || die
+
+	# do not download additional sources via git
+	sed -e "/execute_process ( COMMAND sh -xc \"if/d" \
+		-e "/add_subdirectory ( \${HSA_TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
+		-i test/CMakeLists.txt || die
+
+	hprefixify script/*.py
+}
+
+src_configure() {
+	export HIP_PATH="${EPREFIX}/usr"
+
+	local mycmakeargs=(
+		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/include/hsa"
+	)
+
+	cmake_src_configure
+}