From d15be4fe2ff3e70717117a938dbe5a11cec60a7b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 12 Apr 2023 11:41:02 +0100 Subject: gentoo auto-resync : 12:04:2023 - 11:41:02 --- dev-util/rr/Manifest | 2 + dev-util/rr/files/rr-5.6.0-gcc13-workaround.patch | 222 ++++++++++++++++++++++ dev-util/rr/rr-5.6.0-r4.ebuild | 88 +++++++++ 3 files changed, 312 insertions(+) create mode 100644 dev-util/rr/files/rr-5.6.0-gcc13-workaround.patch create mode 100644 dev-util/rr/rr-5.6.0-r4.ebuild (limited to 'dev-util/rr') diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest index 0fe2ca26cfe9..683a850954f8 100644 --- a/dev-util/rr/Manifest +++ b/dev-util/rr/Manifest @@ -1,6 +1,8 @@ +AUX rr-5.6.0-gcc13-workaround.patch 8710 BLAKE2B 1bba8cd2001e9a69a2d910a8ca5c6db162f85903208d0e4ade17aa1814473459df6828f6be5426179b7d86b30adf3adb0685558c70b4cf7710f791bb684865c9 SHA512 1247acd17a4788b31026689b15c6cb0c70a3512630ac6908106bf30596441c33cb418f8dc292e04622129c3557a0ced009be9e19953e091139afba44d9c1406e AUX rr-5.6.0-gcc13.patch 849 BLAKE2B a66f77a1bb436909cc644773ae1208fb6c7e674d8aac217c54287bf6392b0f13148e34d9868fb7875bf9b736bf5122c4ef52a2d4a6344d8a3f1afbf03a214400 SHA512 9bc28b5011cdb430f82fe88b969ed7ca123c69ad99f1e5d4ebb38ab2aaf9295e78a20019a1b078a9c391be66f20783cd9d86b3609c7248773b2f6eb20320c82d AUX rr-5.6.0-linux-headers-6.0.patch 2303 BLAKE2B 3f804757bc221617939bcfd128546f2bb66d0bd5ec8efb42a6cd05b0aac6e83513d8df89e7838673bc53228801d83ca57a888701539007b73ab9a734d6e2674f SHA512 21216496235e7d7507d319a0b8489a96f44f711dc0727b6bd1828ac80e1ac174a9bf2c9ced7ccadd0cd6d6af64a7a2b1a3f71a25816bef8b6d6e2f884ecd85eb AUX rr-5.6.0-tests-clang16.patch 576 BLAKE2B 2e2141a0dd0c5366497654ed499910f79c8e3cf12b3a4ec102817b03b73c25da8e86b43aee75cf2ac04049f0106086bef2ef37e1c7a1787608db3cf3bcf987cf SHA512 52f40c9b73caa02d39b82703d98201733570865e9ca016b2feaecd0fe34cb69d38a294226311ec686ef921f3a195fb09d7c286e9f375668ec50bd156f4ab1b94 DIST mozilla-rr-5.6.0.tar.gz 1579320 BLAKE2B 14ea99c4486c72db844b5cad3f0c300d7bf5d49449e7080ed0484f89022be6d9b7f81b3808b65f59028a5256a6b3f6508729d5b7e8f3f45d8353ceb7ae2a577a SHA512 4b5ef65b6c6a4b62fc72949b4541aaf608f6133ea0b6c2e529a8eed725e6a0b5186f20ed60b210821e6929410e1f21723840eacfdc85bf12c87703e7ebf5f9a7 EBUILD rr-5.6.0-r2.ebuild 1654 BLAKE2B 8475296a2d61b80ea2d1699e25157123473a471ccb2c144866873df21e2358ed6ffa7d8996bd34ff27aa740f629af80ec959960f01bd3c40a09cf7ee33fce11a SHA512 5a4be367068d39f53ed59548bb9680f70f269cb0ada1758fc3cbb3edf6a623286fedc9c4c054f8c4c470e4fed0374509eb0c07af4365329404c5846294bc3fb7 +EBUILD rr-5.6.0-r4.ebuild 1697 BLAKE2B c33ca4e63fba2de92e6e870cb556c12aaa31a646ad7a040e02da272d50ed8d29b707b76050d8af669a62474194635d7566d2a7e3746e5b307351d4f7755046e4 SHA512 5dae2899b53c3a85309e7954e8149def98f4e0e4ba2a24c88ecd4b57c18666b410d2edf148af4c20b29b6aaacd292f81a4a61f2c81fcb7509e9da9ace9c23751 MISC metadata.xml 448 BLAKE2B 2ca27171b81983b513710708955b70a7a73174ca72fb8bac4c8363a5f0fb464431d9d84d3be7818e4132ff7ca9b2f6b3325c526e6424bbeac8ee6dad1728c8cb SHA512 01fa6e40deff5fc58f51b90f75f93cf38f10ad58e994153045954ebc9d00dc41e7d8ea625b2b882a376cb0db1dbcc9e1a025c85f9fb584ef7a46b6db812b649b diff --git a/dev-util/rr/files/rr-5.6.0-gcc13-workaround.patch b/dev-util/rr/files/rr-5.6.0-gcc13-workaround.patch new file mode 100644 index 000000000000..30dad8d9fa20 --- /dev/null +++ b/dev-util/rr/files/rr-5.6.0-gcc13-workaround.patch @@ -0,0 +1,222 @@ +https://bugs.gentoo.org/897874 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109420 +https://github.com/rr-debugger/rr/issues/3485 +https://github.com/rr-debugger/rr/commit/e32502d00b18a5225d3b7fbab75fb1e63cb367d2 + +From e32502d00b18a5225d3b7fbab75fb1e63cb367d2 Mon Sep 17 00:00:00 2001 +From: Robert O'Callahan +Date: Wed, 5 Apr 2023 08:15:23 +1200 +Subject: [PATCH] Avoid having type members and enum members of `Arch` with the + same name + +Resolves #3485 +--- a/src/kernel_abi.h ++++ b/src/kernel_abi.h +@@ -1282,7 +1282,7 @@ struct BaseArch : public wordsize, + }; + RR_VERIFY_TYPE_EXPLICIT(struct ::timezone, timezone); + +- struct statfs { ++ struct statfs_t { + __statfs_word f_type; + __statfs_word f_bsize; + __statfs_word f_blocks; +@@ -1298,9 +1298,9 @@ struct BaseArch : public wordsize, + __statfs_word f_flags; + __statfs_word f_spare[4]; + }; +- RR_VERIFY_TYPE_EXPLICIT(struct ::statfs, statfs); ++ RR_VERIFY_TYPE_EXPLICIT(struct ::statfs, statfs_t); + +- struct statfs64 { ++ struct statfs64_t { + __statfs_word f_type; + __statfs_word f_bsize; + uint64_t f_blocks; +@@ -1316,7 +1316,7 @@ struct BaseArch : public wordsize, + __statfs_word f_flags; + __statfs_word f_spare[4]; + }; +- RR_VERIFY_TYPE_EXPLICIT(struct ::statfs64, statfs64); ++ RR_VERIFY_TYPE_EXPLICIT(struct ::statfs64, statfs64_t); + + struct itimerval { + timeval it_interval; +@@ -1338,7 +1338,7 @@ struct BaseArch : public wordsize, + } stack_t; + RR_VERIFY_TYPE(stack_t); + +- struct sysinfo { ++ struct sysinfo_t { + __kernel_long_t uptime; + __kernel_ulong_t loads[3]; + __kernel_ulong_t totalram; +@@ -1355,7 +1355,7 @@ struct BaseArch : public wordsize, + uint32_t mem_unit; + char _f[20 - 2 * sizeof(__kernel_ulong_t) - sizeof(uint32_t)]; + }; +- RR_VERIFY_TYPE_EXPLICIT(struct ::sysinfo, sysinfo); ++ RR_VERIFY_TYPE_EXPLICIT(struct ::sysinfo, sysinfo_t); + + static const ::size_t UTSNAME_LENGTH = 65; + struct utsname { +@@ -2093,7 +2093,7 @@ struct X64Arch : public BaseArch { + // Can't verify this one because glibc leaves out the last two members and the + // kernel header isn't available to userspace. + +- struct stat { ++ struct stat_t { + dev_t st_dev; + ino_t st_ino; + nlink_t st_nlink; +@@ -2110,10 +2110,10 @@ struct X64Arch : public BaseArch { + struct timespec st_ctim; + syscall_slong_t __rr_unused[3]; + }; +- RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, struct ::stat, struct stat); ++ RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, struct ::stat, struct stat_t); + +- struct stat64 : public stat {}; +- RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, struct ::stat64, struct stat64); ++ struct stat64_t : public stat_t {}; ++ RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, struct ::stat64, struct stat64_t); + + struct semid64_ds { + ipc64_perm sem_perm; +@@ -2291,7 +2291,7 @@ struct X86Arch : public BaseArch { + }; + RR_VERIFY_TYPE_X86_ARCH(SupportedArch::x86, ::user, user); + +- struct stat { ++ struct stat_t { + dev_t st_dev; + unsigned_short __pad1; + ino_t st_ino; +@@ -2310,9 +2310,9 @@ struct X86Arch : public BaseArch { + unsigned_long __unused4; + unsigned_long __unused5; + }; +- RR_VERIFY_TYPE_ARCH(SupportedArch::x86, struct ::stat, struct stat); ++ RR_VERIFY_TYPE_ARCH(SupportedArch::x86, struct ::stat, struct stat_t); + +- struct __attribute__((packed)) stat64 { ++ struct __attribute__((packed)) stat64_t { + dev_t st_dev; + unsigned_int __pad1; + ino_t __st_ino; +@@ -2330,7 +2330,7 @@ struct X86Arch : public BaseArch { + timespec st_ctim; + ino64_t st_ino; + }; +- RR_VERIFY_TYPE_ARCH(SupportedArch::x86, struct ::stat64, struct stat64); ++ RR_VERIFY_TYPE_ARCH(SupportedArch::x86, struct ::stat64, struct stat64_t); + + struct semid64_ds { + ipc64_perm sem_perm; +@@ -2377,7 +2377,7 @@ struct GenericArch : public BaseArch { + typedef uint32_t legacy_uid_t; + typedef uint32_t legacy_gid_t; + +- struct stat { ++ struct stat_t { + dev_t st_dev; + ino_t st_ino; + mode_t st_mode; +@@ -2405,7 +2405,7 @@ struct GenericArch : public BaseArch { + typename BaseArch::unsigned_long __unused4; + }; + +- struct stat64 : public stat {}; ++ struct stat64_t : public stat_t {}; + }; + + struct ARM64Arch : public GenericArch { +--- a/src/syscalls.py ++++ b/src/syscalls.py +@@ -544,7 +544,7 @@ def __init__(self, **kwargs): + # system. path is the pathname of any file within the mounted file + # system. buf is a pointer to a statfs structure defined + # approximately as follows: +-statfs = EmulatedSyscall(x86=99, x64=137, generic=43, arg2="struct Arch::statfs") ++statfs = EmulatedSyscall(x86=99, x64=137, generic=43, arg2="struct Arch::statfs_t") + + # int fstatfs(int fd, struct statfs *buf) + # +@@ -552,7 +552,7 @@ def __init__(self, **kwargs): + # system. path is the pathname of any file within the + # get_time(GET_TID(thread_id));mounted file system. buf is a pointer + # to a statfs structure defined approximately as follows: +-fstatfs = EmulatedSyscall(x86=100, x64=138, generic=44, arg2="struct Arch::statfs") ++fstatfs = EmulatedSyscall(x86=100, x64=138, generic=44, arg2="struct Arch::statfs_t") + + ioperm = EmulatedSyscall(x86=101, x64=173) + +@@ -574,9 +574,9 @@ def __init__(self, **kwargs): + # stored there. + setitimer = EmulatedSyscall(x86=104, x64=38, generic=103, arg3="typename Arch::itimerval") + getitimer = EmulatedSyscall(x86=105, x64=36, generic=102, arg2="typename Arch::itimerval") +-stat = EmulatedSyscall(x86=106, x64=4, arg2="struct Arch::stat") +-lstat = EmulatedSyscall(x86=107, x64=6, arg2="struct Arch::stat") +-fstat = EmulatedSyscall(x86=108, x64=5, generic=80, arg2="struct Arch::stat") ++stat = EmulatedSyscall(x86=106, x64=4, arg2="struct Arch::stat_t") ++lstat = EmulatedSyscall(x86=107, x64=6, arg2="struct Arch::stat_t") ++fstat = EmulatedSyscall(x86=108, x64=5, generic=80, arg2="struct Arch::stat_t") + olduname = UnsupportedSyscall(x86=109) + iopl = EmulatedSyscall(x86=110, x64=172) + vhangup = UnsupportedSyscall(x86=111, x64=153, generic=58) +@@ -596,7 +596,7 @@ def __init__(self, **kwargs): + # + # sysinfo() provides a simple way of getting overall system + # statistics. +-sysinfo = EmulatedSyscall(x86=116, x64=99, generic=179, arg1="struct Arch::sysinfo") ++sysinfo = EmulatedSyscall(x86=116, x64=99, generic=179, arg1="struct Arch::sysinfo_t") + # int ipc(unsigned int call, int first, int second, int third, void *ptr, long + #fifth); + # +@@ -992,20 +992,20 @@ def __init__(self, **kwargs): + # int stat(const char *path, struct stat *buf); + # + # stat() stats the file pointed to by path and fills in buf. +-stat64 = EmulatedSyscall(x86=195, arg2="struct Arch::stat64") ++stat64 = EmulatedSyscall(x86=195, arg2="struct Arch::stat64_t") + + # int lstat(const char *path, struct stat *buf); + # + # lstat() is identical to stat(), except that if path is a symbolic + # link, then the link itself is stat-ed, not the file that it refers + # to. +-lstat64 = EmulatedSyscall(x86=196, arg2="struct Arch::stat64") ++lstat64 = EmulatedSyscall(x86=196, arg2="struct Arch::stat64_t") + + # int fstat(int fd, struct stat *buf) + # + # fstat() is identical to stat(), except that the file to be stat-ed + # is specified by the file descriptor fd. +-fstat64 = EmulatedSyscall(x86=197, arg2="struct Arch::stat64") ++fstat64 = EmulatedSyscall(x86=197, arg2="struct Arch::stat64_t") + + lchown32 = EmulatedSyscall(x86=198) + +@@ -1342,8 +1342,8 @@ def __init__(self, **kwargs): + # + # FIXME: we use arg3() here, although according to man pages this system + # call has only 2 paramaters. However, strace tells another story... +-statfs64 = EmulatedSyscall(x86=268, arg3="struct Arch::statfs64") +-fstatfs64 = EmulatedSyscall(x86=269, arg3="struct Arch::statfs64") ++statfs64 = EmulatedSyscall(x86=268, arg3="struct Arch::statfs64_t") ++fstatfs64 = EmulatedSyscall(x86=269, arg3="struct Arch::statfs64_t") + + # int tgkill(int tgid, int tid, int sig) + # +@@ -1443,8 +1443,8 @@ def __init__(self, **kwargs): + # The fstatat() system call operates in exactly the same way as + # stat(2), except for the differences described in this manual + # page.... +-fstatat = EmulatedSyscall(x64=262, generic=79, arg3="struct Arch::stat") +-fstatat64 = EmulatedSyscall(x86=300, arg3="struct Arch::stat64") ++fstatat = EmulatedSyscall(x64=262, generic=79, arg3="struct Arch::stat_t") ++fstatat64 = EmulatedSyscall(x86=300, arg3="struct Arch::stat64_t") + + # int unlinkat(int dirfd, const char *pathname, int flags) + # + diff --git a/dev-util/rr/rr-5.6.0-r4.ebuild b/dev-util/rr/rr-5.6.0-r4.ebuild new file mode 100644 index 000000000000..559533e754a6 --- /dev/null +++ b/dev-util/rr/rr-5.6.0-r4.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +CMAKE_BUILD_TYPE=Release + +inherit cmake linux-info python-single-r1 + +DESCRIPTION="Record and Replay Framework" +HOMEPAGE="https://rr-project.org/" +SRC_URI="https://github.com/rr-debugger/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz" + +LICENSE="MIT BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="multilib test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + dev-libs/capnproto:= + sys-libs/zlib:= +" +RDEPEND=" + ${DEPEND} + sys-devel/gdb[xml] +" +# Add all the deps needed only at build/test time. +DEPEND+=" + test? ( + $(python_gen_cond_dep ' + dev-python/pexpect[${PYTHON_USEDEP}] + ') + sys-devel/gdb[xml] + )" + +QA_FLAGS_IGNORED=" + usr/lib.*/rr/librrpage.so + usr/lib.*/rr/librrpage_32.so +" + +RESTRICT="test" # toolchain and kernel version dependent + +PATCHES=( + "${FILESDIR}"/${P}-linux-headers-6.0.patch + "${FILESDIR}"/${P}-tests-clang16.patch + "${FILESDIR}"/${P}-gcc13.patch + "${FILESDIR}"/${P}-gcc13-workaround.patch +) + +pkg_setup() { + if use kernel_linux; then + CONFIG_CHECK="SECCOMP" + linux-info_pkg_setup + fi + python-single-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + sed -i 's:-Werror::' CMakeLists.txt || die #609192 +} + +src_test() { + if has usersandbox ${FEATURES} ; then + ewarn "Test suite fails under FEATURES=usersandbox (bug #632394). Skipping." + return 0 + fi + + cmake_src_test +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -Ddisable32bit=$(usex !multilib) #636786 + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + python_fix_shebang "${ED}"/usr/bin/rr-collect-symbols.py +} -- cgit v1.2.3