gentoo resync : 30.10.2021

3 files changed, 43 insertions, 4 deletions

diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 6182e106dd69..523b1c0119e5 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -1,4 +1,5 @@
 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
 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
@@ -6,5 +7,5 @@ DIST rocprofiler-4.2.0.tar.gz 1408433 BLAKE2B b35a7710d680167bad78ff74be153ea994
 DIST rocprofiler-4.3.0.tar.gz 1402250 BLAKE2B 3826c3b26b0d5838ab3475614c2ecd2265e177fe40b8a90abb491746513bd50841e5ceb34d1fcb4bcb2fbe8a6854b9715d0670d38f08775e5e14cd855f15629b SHA512 e327146604459f2f827ab943a21d0eaa0ee41cf6770ab94dd019d461cf6438e70a48139ce67ec1553d0f450fa5bb233a7ed39438e8bf39b33218d53e2c270d3b
 EBUILD roctracer-4.0.0-r1.ebuild 1572 BLAKE2B dbdbf598991d569c3bc4788d5be653678431df80f8dd5229f5be5a0dda05146ca9417d738ecae08eb6eb10f9056e09403b5289a25badddf5b24d1a863ea778fc SHA512 b4dc5f0f4b189139df9ffcc854daedb0a59547ad99156814ae50b95c888a209d2b4b4771e39599cc3bc5afb5fa44a4010d0fc77b8e80299ecd7a275b7bbf4647
 EBUILD roctracer-4.2.0.ebuild 1794 BLAKE2B 068823ead6d587839af1abf89aa76362dbd7512ca30f0b3c42b4c924d7cd911bae6629cdd779ff9ab1fd7ae50ae0224e9ba94e3f013880859ec0f2073cb862b9 SHA512 52a962894901a1ef2bc8cdc93de1dacbeaadfc7f84ecebf365c4fdcacdca4a2e91badb8bebae6a183613c61979eaf4c785a07aed410b52bbcde691fc57d57369
-EBUILD roctracer-4.3.0.ebuild 2006 BLAKE2B cb01bebefc6bc58d09136acdd72cc7e20a368c28e227bafb5c83d24fc1566b7be54b15ddf726191a85b24c9d6fc257835ad32e769862097d9ab94693a342e820 SHA512 3f6a9fbf97b2b2d428020815b40712b3c149af2ab4721f56c30a7a8e341d396f39117d5e38f9d6b1342afaf1b9f78719c238fce26ccdd6f8ef8880f72bdefe61
+EBUILD roctracer-4.3.0.ebuild 2110 BLAKE2B f4853acadb2b3176bd56462bf1b2489f1e01f96dbcf9c853d5ff2373578da457e29ed719c773900021568b1b9203f89bc9eda1f0bb363cdf5704be8df3e0ca31 SHA512 ec1fb68ffc55cfb8b3ecd8b6d28367803207f5e71de938f30b66e504d74b055c4bd9bb93efe07419a6464f1cf4be8f19551b6271bd4867b813e804e147e0ebae
 MISC metadata.xml 603 BLAKE2B b81a956c8e1b3d4bb6363919f82389ec7030baf7cd949e2ee8704543c515335acc8e497743dffeca426cefc5a89210e75b85c90f5dbc482f54f257e52f5fc77d SHA512 dcad8256b50fbed9b24458d845330756081aaef4c864ca753c074c6299a9dc0234e9dbe421e12e28548887d5ce8a07c06fc54d6942e4902d63964fb229cc734b
diff --git a/dev-util/roctracer/files/roctracer-4.3.0-glibc-2.34.patch b/dev-util/roctracer/files/roctracer-4.3.0-glibc-2.34.patch
new file mode 100644
index 000000000000..e11b1148bb89
--- /dev/null
+++ b/dev-util/roctracer/files/roctracer-4.3.0-glibc-2.34.patch
@@ -0,0 +1,35 @@
+From 5f4c1c01de8f0da24956c1c931d3ffe7410b5b78 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 30 Oct 2021 18:35:53 +0200
+Subject: [PATCH] pthread_yield -> sched_yield (glibc 2.34)
+
+Bug: https://bugs.gentoo.org/808049
+Upstream: https://github.com/ROCm-Developer-Tools/roctracer/pull/63
+---
+ src/core/memory_pool.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/memory_pool.h b/src/core/memory_pool.h
+index fe2f1a6..fbd9060 100644
+--- a/src/core/memory_pool.h
++++ b/src/core/memory_pool.h
+@@ -24,6 +24,7 @@ THE SOFTWARE.
+ #define MEMORY_POOL_H_
+ 
+ #include <pthread.h>
++#include <sched.h>
+ #include <stdlib.h>
+ 
+ #include <atomic>
+@@ -152,7 +153,7 @@ class MemoryPool {
+   }
+ 
+   static void sync_reader(const consumer_arg_t* arg) {
+-    while(arg->valid.load() == true) PTHREAD_CALL(pthread_yield());
++    while(arg->valid.load() == true) PTHREAD_CALL(sched_yield());
+   }
+ 
+   static void* reader_fun(void* consumer_arg) {
+-- 
+2.33.1
+
diff --git a/dev-util/roctracer/roctracer-4.3.0.ebuild b/dev-util/roctracer/roctracer-4.3.0.ebuild
index 19a0adee967b..35092c81a554 100644
--- a/dev-util/roctracer/roctracer-4.3.0.ebuild
+++ b/dev-util/roctracer/roctracer-4.3.0.ebuild
@@ -11,6 +11,7 @@ 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)"
@@ -26,13 +27,16 @@ BDEPEND="
 	')
 "
 
+PATCHES=(
+	# https://github.com/ROCm-Developer-Tools/roctracer/pull/63
+	"${FILESDIR}"/${PN}-4.3.0-glibc-2.34.patch
+)
+
 python_check_deps() {
 	has_version "dev-python/CppHeaderParser[${PYTHON_USEDEP}]" &&
 	has_version "dev-python/ply[${PYTHON_USEDEP}]"
 }
 
-S="${WORKDIR}/roctracer-rocm-${PV}"
-
 src_prepare() {
 	mv "${WORKDIR}"/rocprofiler-rocm-${PV} "${WORKDIR}"/rocprofiler || die
 
@@ -54,7 +58,6 @@ src_prepare() {
 
 	hprefixify script/*.py
 
-	eapply_user
 	cmake_src_prepare
 }