commit:     6659e812e7e0e32f8416667dca9b38297a517588
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  1 15:34:36 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug  1 16:57:25 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6659e812

dev-debug/rr: fix build w/ glibc-2.42

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

 dev-debug/rr/files/rr-5.9.0-glibc-2.42-termio.patch | 20 ++++++++++++++++++++
 dev-debug/rr/rr-5.9.0-r1.ebuild                     |  1 +
 2 files changed, 21 insertions(+)

diff --git a/dev-debug/rr/files/rr-5.9.0-glibc-2.42-termio.patch 
b/dev-debug/rr/files/rr-5.9.0-glibc-2.42-termio.patch
new file mode 100644
index 000000000000..adad86158e98
--- /dev/null
+++ b/dev-debug/rr/files/rr-5.9.0-glibc-2.42-termio.patch
@@ -0,0 +1,20 @@
+https://github.com/rr-debugger/rr/commit/6251648873b9e1ed23536beebbaa5d6fead3d5be
+
+From 6251648873b9e1ed23536beebbaa5d6fead3d5be Mon Sep 17 00:00:00 2001
+From: Robert O'Callahan <[email protected]>
+Date: Tue, 29 Jul 2025 23:05:21 +1200
+Subject: [PATCH] Stop checking struct sizes against glibc `termio` since that
+ has been removed.
+
+Resolves #3995.
+--- a/src/kernel_abi.h
++++ b/src/kernel_abi.h
+@@ -750,7 +750,6 @@ struct BaseArch : public wordsize,
+     unsigned char c_line;
+     unsigned char c_cc[8];
+   };
+-  RR_VERIFY_TYPE(termio);
+ 
+   struct seccomp_notif_sizes {
+     uint16_t seccomp_notif;
+

diff --git a/dev-debug/rr/rr-5.9.0-r1.ebuild b/dev-debug/rr/rr-5.9.0-r1.ebuild
index fb0f8cd33807..64f07bd972c7 100644
--- a/dev-debug/rr/rr-5.9.0-r1.ebuild
+++ b/dev-debug/rr/rr-5.9.0-r1.ebuild
@@ -54,6 +54,7 @@ RESTRICT="test" # toolchain and kernel version dependent
 PATCHES=(
        "${FILESDIR}"/${PN}-5.7.0-no-force-lto.patch
        "${FILESDIR}"/${PN}-5.9.0-zen-workaround-service.patch
+       "${FILESDIR}"/${PN}-5.9.0-glibc-2.42-termio.patch
 )
 
 pkg_setup() {

Reply via email to