commit: 1679b572999e75d58bb326aa545611e1bcf06639 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Oct 27 22:54:30 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Oct 27 22:54:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1679b572
dev-util/google-perftools: drop 2.7-r1 Closes: https://bugs.gentoo.org/818871 Bug: https://bugs.gentoo.org/820449 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/google-perftools/Manifest | 1 - .../google-perftools/files/2.8-musl-tests.patch | 28 ------- .../google-perftools/files/fix_ppc64el_FTBFS.patch | 31 -------- .../google-perftools-2.7-r1.ebuild | 93 ---------------------- 4 files changed, 153 deletions(-) diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest index 30a6cf15a61..4a5f36c2e85 100644 --- a/dev-util/google-perftools/Manifest +++ b/dev-util/google-perftools/Manifest @@ -1,2 +1 @@ -DIST gperftools-2.7.tar.gz 916854 BLAKE2B d14c2b88f2986d3691d7184e1759de2066ca50224f745a6291ab2ebd5f7f985dec4916a1c01d61142eca9b64f3742c50b82e64118602afaa7b27ae2d94a4ed4d SHA512 4a8e72b960218b0615281b830b3f1a4a1b27830006c45ed68b1ffd152bb50a8b3beec850526e330e2ad08c28774bdc01dade9bcc3e7c9e26d30823cc55648d77 DIST gperftools-2.9.1.tar.gz 924910 BLAKE2B fcf0491e42ff4212a63ab0af422f27f5a625c53a0b33e69f8dede96b004a0f01af104d9791a4b75d38145ae0059f5e2967ea1d09b0712cc4d930ef7aafd4f3ba SHA512 5e07f28da9afc5f1ba3df7f06ad0e146c171d33e1779bbaab21547ed234aaced02e5278c1eb8f92fc45480abd2474d6a2d4c71644fb9378f41088c56cc1bc8ab diff --git a/dev-util/google-perftools/files/2.8-musl-tests.patch b/dev-util/google-perftools/files/2.8-musl-tests.patch deleted file mode 100644 index 660099a6a88..00000000000 --- a/dev-util/google-perftools/files/2.8-musl-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1d9b8bb59d5610f2c3e9faad6bbd91ceca17fb93 Mon Sep 17 00:00:00 2001 -From: Aliaksey Kandratsenka <[email protected]> -Date: Sat, 11 Jul 2020 20:33:40 -0700 -Subject: [PATCH] don't test sbrk hook if we're on linux and don't have __sbrk - -"mmap" hooks code for linux only hooks sbrk when __sbrk is -defined. But musl doesn't offer this function (reasonably so), so -sbrk hooking doesn't work there. Not big loss, but lets make sure -tests don't fail. - -Lets reference this to issue #1198 ---- - src/tests/tcmalloc_unittest.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tests/tcmalloc_unittest.cc b/src/tests/tcmalloc_unittest.cc -index d06c5a86..9d303433 100644 ---- a/src/tests/tcmalloc_unittest.cc -+++ b/src/tests/tcmalloc_unittest.cc -@@ -1503,7 +1503,7 @@ static int RunAllTests(int argc, char** argv) { - - // Test sbrk - SetSbrkHook(); --#if defined(HAVE_SBRK) && defined(__linux) && \ -+#if defined(HAVE___SBRK) && defined(__linux) && \ - (defined(__i386__) || defined(__x86_64__)) - p1 = sbrk(8192); - CHECK(p1 != NULL); diff --git a/dev-util/google-perftools/files/fix_ppc64el_FTBFS.patch b/dev-util/google-perftools/files/fix_ppc64el_FTBFS.patch deleted file mode 100644 index 84f28e1eefe..00000000000 --- a/dev-util/google-perftools/files/fix_ppc64el_FTBFS.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: ucontext constants in ptrace.h on ppc64el - Needs to include the mentioned header for ucontext. -Author: Laszlo Boszormenyi (GCS) <[email protected]> -Bug-Debian: https://bugs.debian.org/894749 -Forwarded: no -Last-Update: 2018-05-06 - ---- - ---- google-perftools-2.7.orig/m4/pc_from_ucontext.m4 -+++ google-perftools-2.7/m4/pc_from_ucontext.m4 -@@ -55,7 +55,8 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT], - pc_field_found=true) - elif test "x$ac_cv_header_sys_ucontext_h" = xyes; then - AC_TRY_COMPILE([#define _GNU_SOURCE 1 -- #include <sys/ucontext.h>], -+ #include <sys/ucontext.h>, -+ #include <asm/ptrace.h>], - [ucontext_t u; return u.$pc_field == 0;], - AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field, - How to access the PC from a struct ucontext) ---- google-perftools-2.7.orig/src/getpc.h -+++ google-perftools-2.7/src/getpc.h -@@ -58,6 +58,7 @@ - #include <string.h> // for memcmp - #if defined(HAVE_SYS_UCONTEXT_H) - #include <sys/ucontext.h> -+#include <asm/ptrace.h> - #elif defined(HAVE_UCONTEXT_H) - #include <ucontext.h> // for ucontext_t (and also mcontext_t) - #elif defined(HAVE_CYGWIN_SIGNAL_H) diff --git a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild deleted file mode 100644 index 76dc02a2af3..00000000000 --- a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -MY_P="gperftools-${PV}" - -inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal - -DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools" -HOMEPAGE="https://github.com/gperftools/gperftools"; -SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz"; - -LICENSE="MIT" -SLOT="0/4" -# contains ASM code, with support for -# freebsd x86/amd64 -# linux x86/amd64/ppc/ppc64/arm -# OSX ppc/amd64 -# AIX ppc/ppc64 -KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux" - -IUSE="largepages +debug minimal optimisememory test static-libs" -RESTRICT="!test? ( test )" - -DEPEND="!ppc64? ( sys-libs/libunwind )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/fix_ppc64el_FTBFS.patch - "${FILESDIR}/2.8-musl-tests.patch" -) - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - # set up the make options in here so that we can actually make use - # of them on both compile and install. - - # Avoid building the unit testing if we're not going to execute - # tests; this trick here allows us to ignore the tests without - # touching the build system (and thus without rebuilding - # autotools). Keep commented as long as it's restricted. - use test || \ - MAKEOPTS+=" noinst_PROGRAMS= " -} - -src_prepare() { - default - eautoreconf - multilib_copy_sources -} - -multilib_src_configure() { - use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES - use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW - append-flags -fno-strict-aliasing -fno-omit-frame-pointer - - econf \ - --enable-shared \ - $(use_enable static-libs static) \ - $(use_enable debug debugalloc) \ - $(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi) -} - -src_test() { - case "${LD_PRELOAD}" in - *libsandbox*) - ewarn "Unable to run tests when sandbox is enabled." - ewarn "See https://bugs.gentoo.org/290249"; - return 0 - ;; - esac - - multilib-minimal_src_test -} - -src_install() { - if ! use minimal && has x32 ${MULTILIB_ABIS}; then - MULTILIB_WRAPPED_HEADERS=( - /usr/include/gperftools/heap-checker.h - /usr/include/gperftools/heap-profiler.h - /usr/include/gperftools/stacktrace.h - /usr/include/gperftools/profiler.h - ) - fi - - multilib-minimal_src_install -} - -multilib_src_install_all() { - einstalldocs - use static-libs || find "${D}" -name '*.la' -delete || die -}
