1 |
commit: 1679b572999e75d58bb326aa545611e1bcf06639 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 27 22:54:30 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 27 22:54:30 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1679b572 |
7 |
|
8 |
dev-util/google-perftools: drop 2.7-r1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/818871 |
11 |
Bug: https://bugs.gentoo.org/820449 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
dev-util/google-perftools/Manifest | 1 - |
15 |
.../google-perftools/files/2.8-musl-tests.patch | 28 ------- |
16 |
.../google-perftools/files/fix_ppc64el_FTBFS.patch | 31 -------- |
17 |
.../google-perftools-2.7-r1.ebuild | 93 ---------------------- |
18 |
4 files changed, 153 deletions(-) |
19 |
|
20 |
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest |
21 |
index 30a6cf15a61..4a5f36c2e85 100644 |
22 |
--- a/dev-util/google-perftools/Manifest |
23 |
+++ b/dev-util/google-perftools/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST gperftools-2.7.tar.gz 916854 BLAKE2B d14c2b88f2986d3691d7184e1759de2066ca50224f745a6291ab2ebd5f7f985dec4916a1c01d61142eca9b64f3742c50b82e64118602afaa7b27ae2d94a4ed4d SHA512 4a8e72b960218b0615281b830b3f1a4a1b27830006c45ed68b1ffd152bb50a8b3beec850526e330e2ad08c28774bdc01dade9bcc3e7c9e26d30823cc55648d77 |
26 |
DIST gperftools-2.9.1.tar.gz 924910 BLAKE2B fcf0491e42ff4212a63ab0af422f27f5a625c53a0b33e69f8dede96b004a0f01af104d9791a4b75d38145ae0059f5e2967ea1d09b0712cc4d930ef7aafd4f3ba SHA512 5e07f28da9afc5f1ba3df7f06ad0e146c171d33e1779bbaab21547ed234aaced02e5278c1eb8f92fc45480abd2474d6a2d4c71644fb9378f41088c56cc1bc8ab |
27 |
|
28 |
diff --git a/dev-util/google-perftools/files/2.8-musl-tests.patch b/dev-util/google-perftools/files/2.8-musl-tests.patch |
29 |
deleted file mode 100644 |
30 |
index 660099a6a88..00000000000 |
31 |
--- a/dev-util/google-perftools/files/2.8-musl-tests.patch |
32 |
+++ /dev/null |
33 |
@@ -1,28 +0,0 @@ |
34 |
-From 1d9b8bb59d5610f2c3e9faad6bbd91ceca17fb93 Mon Sep 17 00:00:00 2001 |
35 |
-From: Aliaksey Kandratsenka <alkondratenko@×××××.com> |
36 |
-Date: Sat, 11 Jul 2020 20:33:40 -0700 |
37 |
-Subject: [PATCH] don't test sbrk hook if we're on linux and don't have __sbrk |
38 |
- |
39 |
-"mmap" hooks code for linux only hooks sbrk when __sbrk is |
40 |
-defined. But musl doesn't offer this function (reasonably so), so |
41 |
-sbrk hooking doesn't work there. Not big loss, but lets make sure |
42 |
-tests don't fail. |
43 |
- |
44 |
-Lets reference this to issue #1198 |
45 |
---- |
46 |
- src/tests/tcmalloc_unittest.cc | 2 +- |
47 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
48 |
- |
49 |
-diff --git a/src/tests/tcmalloc_unittest.cc b/src/tests/tcmalloc_unittest.cc |
50 |
-index d06c5a86..9d303433 100644 |
51 |
---- a/src/tests/tcmalloc_unittest.cc |
52 |
-+++ b/src/tests/tcmalloc_unittest.cc |
53 |
-@@ -1503,7 +1503,7 @@ static int RunAllTests(int argc, char** argv) { |
54 |
- |
55 |
- // Test sbrk |
56 |
- SetSbrkHook(); |
57 |
--#if defined(HAVE_SBRK) && defined(__linux) && \ |
58 |
-+#if defined(HAVE___SBRK) && defined(__linux) && \ |
59 |
- (defined(__i386__) || defined(__x86_64__)) |
60 |
- p1 = sbrk(8192); |
61 |
- CHECK(p1 != NULL); |
62 |
|
63 |
diff --git a/dev-util/google-perftools/files/fix_ppc64el_FTBFS.patch b/dev-util/google-perftools/files/fix_ppc64el_FTBFS.patch |
64 |
deleted file mode 100644 |
65 |
index 84f28e1eefe..00000000000 |
66 |
--- a/dev-util/google-perftools/files/fix_ppc64el_FTBFS.patch |
67 |
+++ /dev/null |
68 |
@@ -1,31 +0,0 @@ |
69 |
-Description: ucontext constants in ptrace.h on ppc64el |
70 |
- Needs to include the mentioned header for ucontext. |
71 |
-Author: Laszlo Boszormenyi (GCS) <gcs@××××××.org> |
72 |
-Bug-Debian: https://bugs.debian.org/894749 |
73 |
-Forwarded: no |
74 |
-Last-Update: 2018-05-06 |
75 |
- |
76 |
---- |
77 |
- |
78 |
---- google-perftools-2.7.orig/m4/pc_from_ucontext.m4 |
79 |
-+++ google-perftools-2.7/m4/pc_from_ucontext.m4 |
80 |
-@@ -55,7 +55,8 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT], |
81 |
- pc_field_found=true) |
82 |
- elif test "x$ac_cv_header_sys_ucontext_h" = xyes; then |
83 |
- AC_TRY_COMPILE([#define _GNU_SOURCE 1 |
84 |
-- #include <sys/ucontext.h>], |
85 |
-+ #include <sys/ucontext.h>, |
86 |
-+ #include <asm/ptrace.h>], |
87 |
- [ucontext_t u; return u.$pc_field == 0;], |
88 |
- AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field, |
89 |
- How to access the PC from a struct ucontext) |
90 |
---- google-perftools-2.7.orig/src/getpc.h |
91 |
-+++ google-perftools-2.7/src/getpc.h |
92 |
-@@ -58,6 +58,7 @@ |
93 |
- #include <string.h> // for memcmp |
94 |
- #if defined(HAVE_SYS_UCONTEXT_H) |
95 |
- #include <sys/ucontext.h> |
96 |
-+#include <asm/ptrace.h> |
97 |
- #elif defined(HAVE_UCONTEXT_H) |
98 |
- #include <ucontext.h> // for ucontext_t (and also mcontext_t) |
99 |
- #elif defined(HAVE_CYGWIN_SIGNAL_H) |
100 |
|
101 |
diff --git a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild |
102 |
deleted file mode 100644 |
103 |
index 76dc02a2af3..00000000000 |
104 |
--- a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild |
105 |
+++ /dev/null |
106 |
@@ -1,93 +0,0 @@ |
107 |
-# Copyright 1999-2020 Gentoo Authors |
108 |
-# Distributed under the terms of the GNU General Public License v2 |
109 |
- |
110 |
-EAPI=6 |
111 |
-MY_P="gperftools-${PV}" |
112 |
- |
113 |
-inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal |
114 |
- |
115 |
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools" |
116 |
-HOMEPAGE="https://github.com/gperftools/gperftools" |
117 |
-SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz" |
118 |
- |
119 |
-LICENSE="MIT" |
120 |
-SLOT="0/4" |
121 |
-# contains ASM code, with support for |
122 |
-# freebsd x86/amd64 |
123 |
-# linux x86/amd64/ppc/ppc64/arm |
124 |
-# OSX ppc/amd64 |
125 |
-# AIX ppc/ppc64 |
126 |
-KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux" |
127 |
- |
128 |
-IUSE="largepages +debug minimal optimisememory test static-libs" |
129 |
-RESTRICT="!test? ( test )" |
130 |
- |
131 |
-DEPEND="!ppc64? ( sys-libs/libunwind )" |
132 |
-RDEPEND="${DEPEND}" |
133 |
- |
134 |
-PATCHES=( |
135 |
- "${FILESDIR}"/fix_ppc64el_FTBFS.patch |
136 |
- "${FILESDIR}/2.8-musl-tests.patch" |
137 |
-) |
138 |
- |
139 |
-S="${WORKDIR}/${MY_P}" |
140 |
- |
141 |
-pkg_setup() { |
142 |
- # set up the make options in here so that we can actually make use |
143 |
- # of them on both compile and install. |
144 |
- |
145 |
- # Avoid building the unit testing if we're not going to execute |
146 |
- # tests; this trick here allows us to ignore the tests without |
147 |
- # touching the build system (and thus without rebuilding |
148 |
- # autotools). Keep commented as long as it's restricted. |
149 |
- use test || \ |
150 |
- MAKEOPTS+=" noinst_PROGRAMS= " |
151 |
-} |
152 |
- |
153 |
-src_prepare() { |
154 |
- default |
155 |
- eautoreconf |
156 |
- multilib_copy_sources |
157 |
-} |
158 |
- |
159 |
-multilib_src_configure() { |
160 |
- use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES |
161 |
- use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW |
162 |
- append-flags -fno-strict-aliasing -fno-omit-frame-pointer |
163 |
- |
164 |
- econf \ |
165 |
- --enable-shared \ |
166 |
- $(use_enable static-libs static) \ |
167 |
- $(use_enable debug debugalloc) \ |
168 |
- $(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi) |
169 |
-} |
170 |
- |
171 |
-src_test() { |
172 |
- case "${LD_PRELOAD}" in |
173 |
- *libsandbox*) |
174 |
- ewarn "Unable to run tests when sandbox is enabled." |
175 |
- ewarn "See https://bugs.gentoo.org/290249" |
176 |
- return 0 |
177 |
- ;; |
178 |
- esac |
179 |
- |
180 |
- multilib-minimal_src_test |
181 |
-} |
182 |
- |
183 |
-src_install() { |
184 |
- if ! use minimal && has x32 ${MULTILIB_ABIS}; then |
185 |
- MULTILIB_WRAPPED_HEADERS=( |
186 |
- /usr/include/gperftools/heap-checker.h |
187 |
- /usr/include/gperftools/heap-profiler.h |
188 |
- /usr/include/gperftools/stacktrace.h |
189 |
- /usr/include/gperftools/profiler.h |
190 |
- ) |
191 |
- fi |
192 |
- |
193 |
- multilib-minimal_src_install |
194 |
-} |
195 |
- |
196 |
-multilib_src_install_all() { |
197 |
- einstalldocs |
198 |
- use static-libs || find "${D}" -name '*.la' -delete || die |
199 |
-} |