[gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/files/, dev-util/valgrind/

[Sam James]

commit:     47e9795efeaedaf611cc959b1f8acaa51bb2f1f5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 02:14:31 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 03:24:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e9795e

dev-util/valgrind: fix tests w/ gcc 13

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../valgrind/files/valgrind-3.20.0-gcc-13.patch    | 44 ++++++++++++++++++++++
 dev-util/valgrind/valgrind-3.20.0-r2.ebuild        |  1 +
 2 files changed, 45 insertions(+)

diff --git a/dev-util/valgrind/files/valgrind-3.20.0-gcc-13.patch b/dev-util/valgrind/files/valgrind-3.20.0-gcc-13.patch
new file mode 100644
index 000000000000..3d3644f85fc1
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.20.0-gcc-13.patch
@@ -0,0 +1,44 @@
+https://sourceware.org/git/?p=valgrind.git;a=commit;h=dee222c6e818ca43ac45952fc8a020f445d98781
+https://sourceware.org/git/?p=valgrind.git;a=commit;h=3155bacf26237beb65edb4a572402492b2f1b050
+
+From dee222c6e818ca43ac45952fc8a020f445d98781 Mon Sep 17 00:00:00 2001
+From: Paul Floyd <pjfloyd@×××××××.fr>
+Date: Fri, 27 Jan 2023 08:30:41 +0100
+Subject: [PATCH] Bug 464859 - Build failures with GCC-13 (drd tsan_unittest)
+
+Patch submitted by
+	Khem Raj <raj.khem@×××××.com>
+--- a/drd/tests/tsan_thread_wrappers_pthread.h
++++ b/drd/tests/tsan_thread_wrappers_pthread.h
+@@ -55,6 +55,7 @@
+ #define NO_TLS
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ using namespace std;
+ 
+-- 
+2.31.1
+
+From 3155bacf26237beb65edb4a572402492b2f1b050 Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@×××××.org>
+Date: Sat, 28 Jan 2023 21:53:44 +0100
+Subject: [PATCH] tsan_thread_wrappers_pthread.h: Only include cstdint for
+ C++11
+
+Fixes build on older g++.
+--- a/drd/tests/tsan_thread_wrappers_pthread.h
++++ b/drd/tests/tsan_thread_wrappers_pthread.h
+@@ -55,7 +55,9 @@
+ #define NO_TLS
+ #endif
+ 
++#if __cplusplus >= 201103L
+ #include <cstdint>
++#endif
+ #include <string>
+ using namespace std;
+ 
+-- 
+2.31.1

diff --git a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
index 4c27c1d3c9b1..131bcaad0a1a 100644
--- a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
 	"${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
 	"${FILESDIR}"/${P}-tests-clang16.patch
+	"${FILESDIR}"/${P}-gcc-13.patch
 )
 
 src_prepare() {