diff options
Diffstat (limited to 'dev-util/rr')
-rw-r--r-- | dev-util/rr/Manifest | 5 | ||||
-rw-r--r-- | dev-util/rr/files/rr-5.2.0-c++14.patch | 13 | ||||
-rw-r--r-- | dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch | 35 | ||||
-rw-r--r-- | dev-util/rr/files/rr-5.2.0-ucontext_t.patch | 65 | ||||
-rw-r--r-- | dev-util/rr/rr-5.2.0-r1.ebuild | 74 |
5 files changed, 0 insertions, 192 deletions
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest index deb93f86e30a..7524a121ba03 100644 --- a/dev-util/rr/Manifest +++ b/dev-util/rr/Manifest @@ -1,8 +1,3 @@ -AUX rr-5.2.0-c++14.patch 791 BLAKE2B 6e13ead39239a2ec2cfd0a7c9537b7780ede7fdacdca5d34302b269ae67e73abca6dda22c6dff4c918040d46ec6745ba7eb45602a6464bd5a454a0cfa3633786 SHA512 9aec12ef80b8c83de56e8186e43db3bda1c10028255eccf8aac4db5f3cc817092a8d59b578145bdb87eb01fc761d5d3c1734daec337b7342a892b3017a51035d -AUX rr-5.2.0-tgkill-glibc-2.30.patch 1076 BLAKE2B 52fbe716a4830197800d63eac91188abc45fb55936c1580d965ec0864b06a230bd9e2f13036387cc17ec583bd87c580ae29ea53f9250ac0eb5439c8af629ee30 SHA512 f6d21968118499d4fc1f2d6437904d225a767f36738e859218606c13fe641b74a6eb778170e1a99fa89d5cbb915bcef4294d2c4f71f4d1a8a3b76bf261d079a2 -AUX rr-5.2.0-ucontext_t.patch 1936 BLAKE2B 11f032058be13960f090a851c09e4612d6a2574d6e54c583d1c7741468810c10b38d4e2a5b24496f8c1a6505bcbc47a6f8fa326ae7853f623d71cbe2b6f1fad2 SHA512 4ee8c1f40926e591e98b268461cc0e5eedcc3d5493bed2ebeedbffcf8745fa7899ed076e7e75cd4e4bfdb413e673795a8ed76f0ef00c68170e992d3b07294c95 -DIST mozilla-rr-5.2.0.tar.gz 1168734 BLAKE2B 2f15c4ec4a271f930334577e98b14e37d2a0eb7cd3443e7110d3562ac4ef30c310e6448a588f4e31f2943a6d4ff0af006cbbafc50722543436fcae3bdc8e453f SHA512 4465985f67e9812b62b91ac7942105a9f976faf0c0d7c352a99a638fe6bdfde024f939b3daa922d431c7fc87118ae4d9d039b00345760fb547c349e8737dc168 DIST mozilla-rr-5.3.0.tar.gz 1343557 BLAKE2B 80ed2feb52fd34b424193902c02408443e5ae943a34d3fe8e75c4c813042c6dd7f39571924ce94aca558ea5f1630f9bda28bea9d5f7e2d429d772a85d3e3e7ad SHA512 6ae37a3ced0c001208fb981abc18f02b912a2851564955dd8da364cb30d9580ea6c91bedbef6495da5d082954d4f261eeaea81df1e9895b4adf948e9998f4c2b -EBUILD rr-5.2.0-r1.ebuild 1488 BLAKE2B 98a6509563a39415d158f7a2108984648a3c0f3fad8224c15c767c4cbffe71e834f0314bcf39cf4a1a177444edfd735592f6c8ccffbd46d382eac6087d97018e SHA512 bd3c71399d4f1bcb7007129862978c773afb459f41f69f51b661441ac8a6ef950737ae1e269dc9c555026245bf8967b944dee557c1abae9866c4a9d468f33268 EBUILD rr-5.3.0-r1.ebuild 1368 BLAKE2B 1f9ef787e458c599e0d13efa9b7325dd91d2a84013832f59da1e58d907ebdbeeb0858c29ddfb42ff57213aa100f028e06170b7e6fb28ffe78683c77419382f07 SHA512 797cae8fc2432e41b24ee03db7bfa0466dbf41e19682c08a827da698ae4f784687b9f243e3fe86ce9ca76892b8f421bb5ba0a34cc1d43ce9e2cf8edaf3aeafd5 MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a diff --git a/dev-util/rr/files/rr-5.2.0-c++14.patch b/dev-util/rr/files/rr-5.2.0-c++14.patch deleted file mode 100644 index 8458de5f1e9f..000000000000 --- a/dev-util/rr/files/rr-5.2.0-c++14.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0d711f9..756a62e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,7 +42,7 @@ set(FLAGS_COMMON "-msse2 -D__MMX__ -D__SSE__ -D__SSE2__ -D__USE_LARGEFILE64 -pth - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS_COMMON} -Wstrict-prototypes -std=gnu11") - # Define __STDC_LIMIT_MACROS so |#include <stdint.h>| works as expected. - # Define __STDC_FORMAT_MACROS so |#include <inttypes.h>| works as expected. --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS_COMMON} -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++14") - set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -g3") - - set(RR_FLAGS_DEBUG "-Wall -Wextra -O0 -DDEBUG -UNDEBUG") diff --git a/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch b/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch deleted file mode 100644 index 2a6e9daef2fb..000000000000 --- a/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://bugs.gentoo.org/699886 - -From 7044c5c6a8e64c737ba3cdb97187ff5c406e5162 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io> -Date: Thu, 23 May 2019 23:18:26 +0200 -Subject: [PATCH] Fix build in newer glibc. - -Seems tgkill was added recently to glibc. - -build/32/tgkill.c:7:12: error: static declaration of 'tgkill' follows non-static declaration -static int tgkill(int tgid, int tid, int sig) { - ^ -/usr/include/bits/signal_ext.h:29:12: note: previous declaration is here -extern int tgkill (__pid_t __tgid, __pid_t __tid, int __signal); ---- - src/test/tgkill.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/src/test/tgkill.c -+++ b/src/test/tgkill.c -@@ -4,9 +4,8 @@ - - static int num_signals_caught; - --static int tgkill(int tgid, int tid, int sig) { -- return syscall(SYS_tgkill, tgid, tid, sig); --} -+#define tgkill(tgid, tid, sig) \ -+ syscall(SYS_tgkill, (int)(tgid), (int)(tid), (int)(sig)) - - static void sighandler(int sig) { - atomic_printf("Task %d got signal %d\n", sys_gettid(), sig); --- -2.24.0 - diff --git a/dev-util/rr/files/rr-5.2.0-ucontext_t.patch b/dev-util/rr/files/rr-5.2.0-ucontext_t.patch deleted file mode 100644 index 0015f0b150c0..000000000000 --- a/dev-util/rr/files/rr-5.2.0-ucontext_t.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 53c5bd72bae089616a3ca626b8af240481d70e6f Mon Sep 17 00:00:00 2001 -From: Robert O'Callahan <robert@ocallahan.org> -Date: Fri, 10 Aug 2018 15:17:55 +1200 -Subject: [PATCH] Remove ucontext_t/rt_sigframe from kernel-abi - -These were added in 18bb097736a1b728f1e5bfec972ca10f6e763d82 to help us determine -the sigmask effect of rt_sigreturn syscalls, but they're no longer needed -because we query the new mask via /proc instead. - -Resolves #2237 ---- - src/kernel_abi.h | 33 --------------------------------- - 1 file changed, 33 deletions(-) - -diff --git a/src/kernel_abi.h b/src/kernel_abi.h -index e73e49933..29d3c9242 100644 ---- a/src/kernel_abi.h -+++ b/src/kernel_abi.h -@@ -1609,23 +1609,6 @@ struct X86Arch : public BaseArch<SupportedArch::x86, WordSize32Defs> { - }; - RR_VERIFY_TYPE_ARCH(SupportedArch::x86, ::sigcontext, sigcontext); - -- struct ucontext_t { -- uint32_t uc_flags; -- uint32_t uc_link; -- stack_t uc_stack; -- sigcontext uc_mcontext; -- kernel_sigset_t uc_sigmask; -- }; -- -- struct rt_sigframe { -- uint32_t pretcode; -- int sig; -- uint32_t pinfo; -- uint32_t puc; -- siginfo_t info; -- struct ucontext_t uc; -- }; -- - struct _fpstate_32 { - uint32_t cw, sw, tag, ipoff, cssel, dataoff, datasel; - uint16_t _st[40]; -@@ -1806,22 +1789,6 @@ struct X64Arch : public BaseArch<SupportedArch::x86_64, WordSize64Defs> { - RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::user_fpregs_struct, - user_fpregs_struct); - -- struct ucontext_t { -- uint64_t ucflags; -- ptr<struct ucontext_t> uc_link; -- stack_t uc_stack; -- struct sigcontext uc_mcontext; -- sigset_t uc_sigmask; -- user_fpregs_struct uc_fpregs; -- }; -- RR_VERIFY_TYPE_ARCH(SupportedArch::x86_64, ::ucontext_t, ucontext_t); -- -- struct rt_sigframe { -- ptr<char> pretcode; -- struct ucontext_t uc; -- siginfo_t info; -- }; -- - struct user { - struct user_regs_struct regs; - int u_fpvalid; diff --git a/dev-util/rr/rr-5.2.0-r1.ebuild b/dev-util/rr/rr-5.2.0-r1.ebuild deleted file mode 100644 index b60628ad4eec..000000000000 --- a/dev-util/rr/rr-5.2.0-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -CMAKE_BUILD_TYPE=Release - -inherit cmake-utils linux-info python-single-r1 - -DESCRIPTION="Record and Replay Framework" -HOMEPAGE="https://rr-project.org/" -SRC_URI="https://github.com/mozilla/${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=" - sys-libs/zlib - dev-libs/capnproto - ${PYTHON_DEPS}" -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_MULTI_USEDEP}] - ') - sys-devel/gdb[xml] - )" - -RESTRICT="test" # toolchain and kernel version dependent - -PATCHES=( - "${FILESDIR}"/${P}-ucontext_t.patch - "${FILESDIR}"/${P}-c++14.patch - "${FILESDIR}"/${P}-tgkill-glibc-2.30.patch -) - -pkg_setup() { - if use kernel_linux; then - CONFIG_CHECK="SECCOMP" - linux-info_pkg_setup - fi - python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_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-utils_src_test -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -Ddisable32bit=$(usex !multilib) #636786 - ) - - cmake-utils_src_configure -} |