commit:     c475a15534e162c894808eabb0d5d7f85d1efd16
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 18:24:17 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 20:41:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c475a155

dev-util/rr: fix build w/ gcc 13

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

 dev-util/rr/files/rr-5.6.0-gcc13.patch | 32 ++++++++++++++++++++++++++++++++
 dev-util/rr/rr-5.6.0-r2.ebuild         |  1 +
 2 files changed, 33 insertions(+)

diff --git a/dev-util/rr/files/rr-5.6.0-gcc13.patch 
b/dev-util/rr/files/rr-5.6.0-gcc13.patch
new file mode 100644
index 000000000000..41092a958dd7
--- /dev/null
+++ b/dev-util/rr/files/rr-5.6.0-gcc13.patch
@@ -0,0 +1,32 @@
+https://github.com/rr-debugger/rr/commit/2248c85c424e8c257ca88af2732782574d6a3544
+
+From 2248c85c424e8c257ca88af2732782574d6a3544 Mon Sep 17 00:00:00 2001
+From: William Cohen <wco...@redhat.com>
+Date: Wed, 18 Jan 2023 12:15:04 -0500
+Subject: [PATCH] Explicitly include <cstdint> where required.
+
+The uint8_t and uintptr_t ptr types are from the header <cstdint>.
+Earlier versions of gcc appear to declare them even if the header
+is not included, but gcc-13 does not.  Explicitly including the
+header to allow compilations with gcc-13.
+--- a/src/log.h
++++ b/src/log.h
+@@ -9,6 +9,7 @@
+ #include <iostream>
+ #include <type_traits>
+ #include <vector>
++#include <cstdint>
+ 
+ /**
+  * Print siginfo on ostream.
+--- a/src/remote_ptr.h
++++ b/src/remote_ptr.h
+@@ -5,6 +5,7 @@
+ 
+ #include <cstddef>
+ #include <iostream>
++#include <cstdint>
+ 
+ namespace rr {
+ 
+

diff --git a/dev-util/rr/rr-5.6.0-r2.ebuild b/dev-util/rr/rr-5.6.0-r2.ebuild
index e8ea3b984e22..27ec0c68e8a2 100644
--- a/dev-util/rr/rr-5.6.0-r2.ebuild
+++ b/dev-util/rr/rr-5.6.0-r2.ebuild
@@ -46,6 +46,7 @@ RESTRICT="test" # toolchain and kernel version dependent
 PATCHES=(
        "${FILESDIR}"/${P}-linux-headers-6.0.patch
        "${FILESDIR}"/${P}-tests-clang16.patch
+       "${FILESDIR}"/${P}-gcc13.patch
 )
 
 pkg_setup() {

Reply via email to