commit: 917aa38acc1b318f410ce605461ce835d417ad4f Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com> AuthorDate: Sat Mar 13 14:55:13 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 13 21:02:39 2021 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=917aa38a
dev-util/valgrind: remove from overlay Package-Manager: Portage-3.0.17, Repoman-3.0.2 RepoMan-Options: --force Manifest-Sign-Key: 0xA1919C830E9498E0 Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com> Closes: https://github.com/gentoo/musl/pull/416 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/valgrind/Manifest | 1 - dev-util/valgrind/files/valgrind-3.11.0-musl.patch | 45 ---------- .../files/valgrind-3.7.0-fno-stack-protector.patch | 12 --- .../files/valgrind-3.7.0-respect-flags.patch | 13 --- dev-util/valgrind/metadata.xml | 28 ------- dev-util/valgrind/valgrind-3.12.0.ebuild | 98 ---------------------- 6 files changed, 197 deletions(-) diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest deleted file mode 100644 index e54eaa2..0000000 --- a/dev-util/valgrind/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST valgrind-3.12.0.tar.bz2 12788556 SHA256 67ca4395b2527247780f36148b084f5743a68ab0c850cb43e4a5b4b012cf76a1 SHA512 2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be WHIRLPOOL 136dd4f358bd18165a5801083cc73fc269a84bf491880af9842e789feea62181e16ca4c099db06fb4ffacf0cb0189b1b29d64790cc4202442f6f6b71ce4c6eea diff --git a/dev-util/valgrind/files/valgrind-3.11.0-musl.patch b/dev-util/valgrind/files/valgrind-3.11.0-musl.patch deleted file mode 100644 index a76a741..0000000 --- a/dev-util/valgrind/files/valgrind-3.11.0-musl.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naurw valgrind-3.11.0.orig/configure.ac valgrind-3.11.0/configure.ac ---- valgrind-3.11.0.orig/configure.ac 2015-09-22 13:26:31.000000000 -0700 -+++ valgrind-3.11.0/configure.ac 2015-09-26 11:54:13.570025359 -0700 -@@ -1066,8 +1066,6 @@ - ;; - 2.0|2.1|*) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,]) -- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc]) - ;; - esac - -diff -Naurw valgrind-3.11.0.orig/coregrind/vg_preloaded.c valgrind-3.11.0/coregrind/vg_preloaded.c ---- valgrind-3.11.0.orig/coregrind/vg_preloaded.c 2015-09-08 06:23:26.000000000 -0700 -+++ valgrind-3.11.0/coregrind/vg_preloaded.c 2015-09-26 11:54:52.383359849 -0700 -@@ -56,7 +56,7 @@ - void VG_NOTIFY_ON_LOAD(freeres)( void ); - void VG_NOTIFY_ON_LOAD(freeres)( void ) - { --# if !defined(__UCLIBC__) \ -+# if defined(__GLIBC__) \ - && !defined(VGPV_arm_linux_android) \ - && !defined(VGPV_x86_linux_android) \ - && !defined(VGPV_mips32_linux_android) \ -diff -Naurw valgrind-3.11.0.orig/include/pub_tool_redir.h valgrind-3.11.0/include/pub_tool_redir.h ---- valgrind-3.11.0.orig/include/pub_tool_redir.h 2015-09-08 06:23:26.000000000 -0700 -+++ valgrind-3.11.0/include/pub_tool_redir.h 2015-09-26 11:57:20.796697605 -0700 -@@ -242,7 +242,7 @@ - /* --- Soname of the standard C library. --- */ - - #if defined(VGO_linux) || defined(VGO_solaris) --# define VG_Z_LIBC_SONAME libcZdsoZa // libc.so* -+# define VG_Z_LIBC_SONAME libcZdZa // libc.* - - #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6) - # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib -@@ -274,7 +274,7 @@ - /* --- Soname of the pthreads library. --- */ - - #if defined(VGO_linux) --# define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0 -+# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.* - #elif defined(VGO_darwin) - # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib - #elif defined(VGO_solaris) diff --git a/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch b/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch deleted file mode 100644 index 6af4553..0000000 --- a/dev-util/valgrind/files/valgrind-3.7.0-fno-stack-protector.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur valgrind-3.7.0.orig//Makefile.all.am valgrind-3.7.0/Makefile.all.am ---- valgrind-3.7.0.orig//Makefile.all.am 2011-10-26 17:24:45.000000000 -0400 -+++ valgrind-3.7.0/Makefile.all.am 2011-11-10 16:18:18.000000000 -0500 -@@ -82,7 +82,7 @@ - # performance and get whatever useful warnings we can out of gcc. - # -fno-builtin is important for defeating LLVM's idiom recognition - # that somehow causes VG_(memset) to get into infinite recursion. --AM_CFLAGS_BASE = \ -+AM_CFLAGS_BASE = -fno-stack-protector \ - -O2 -g \ - -Wall \ - -Wmissing-prototypes \ diff --git a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch b/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch deleted file mode 100644 index 860e09c..0000000 --- a/dev-util/valgrind/files/valgrind-3.7.0-respect-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am ---- valgrind-3.7.0.orig//mpi/Makefile.am 2011-10-26 17:24:23.000000000 -0400 -+++ valgrind-3.7.0/mpi/Makefile.am 2011-11-10 16:03:14.000000000 -0500 -@@ -7,9 +7,6 @@ - CC = $(MPI_CC) - DEFS = - DEFAULT_INCLUDES = --CPPFLAGS = --CFLAGS = --LDFLAGS = - - EXTRA_DIST = \ - mpiwrap_type_test.c diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml deleted file mode 100644 index 31d1b4f..0000000 --- a/dev-util/valgrind/metadata.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>bluen...@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> - <maintainer type="person"> - <email>wizarde...@gentoo.org</email> - <name>Austin English</name> - </maintainer> - <longdescription> - Valgrind is a GPL'd tool to help you find memory-management problems - in your programs. When a program is run under Valgrind's supervision, - all reads and writes of memory are checked, and calls to - malloc/new/free/delete are intercepted. As a result, Valgrind can - detect problems such as - - - Use of uninitialised memory - - Reading/writing memory after it has been free'd - - Reading/writing off the end of malloc'd blocks - - Reading/writing inappropriate areas on the stack - - Memory leaks -- where pointers to malloc'd blocks are lost forever - - Passing of uninitialised and/or unaddressible memory to system calls - - Mismatched use of malloc/new/new [] vs free/delete/delete [] - - Some abuses of the POSIX Pthreads API - </longdescription> -</pkgmetadata> diff --git a/dev-util/valgrind/valgrind-3.12.0.ebuild b/dev-util/valgrind/valgrind-3.12.0.ebuild deleted file mode 100644 index 73421e2..0000000 --- a/dev-util/valgrind/valgrind-3.12.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils - -DESCRIPTION="An open-source memory debugger for GNU/Linux" -HOMEPAGE="http://www.valgrind.org"; -SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* amd64 arm arm64 ppc x86" -IUSE="mpi" - -DEPEND="mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -src_prepare() { - # Correct hard coded doc location - sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die - - # Don't force multiarch stuff on OSX, bug #306467 - sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die - - # Respect CFLAGS, LDFLAGS - epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch - - # Changing Makefile.all.am to disable SSP - epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch - - # Fix for MUSL. - epatch "${FILESDIR}"/${PN}-3.11.0-musl.patch - - # Allow users to test their own patches - epatch_user - - # Regenerate autotools files - eautoreconf -} - -src_configure() { - local myconf - - # Respect ar, bug #468114 - tc-export AR - - # -fomit-frame-pointer "Assembler messages: Error: junk `8' after expression" - # while compiling insn_sse.c in none/tests/x86 - # -fstack-protector more undefined references to __guard and __stack_smash_handler - # because valgrind doesn't link to glibc (bug #114347) - # -m64 -mx32 for multilib-portage, bug #398825 - # -ggdb3 segmentation fault on startup - filter-flags -fomit-frame-pointer - filter-flags -fstack-protector - filter-flags -m64 -mx32 - replace-flags -ggdb3 -ggdb2 - - if use amd64 || use ppc64; then - ! has_multilib_profile && myconf="${myconf} --enable-only64bit" - fi - - # Force bitness on darwin, bug #306467 - use x86-macos && myconf="${myconf} --enable-only32bit" - use x64-macos && myconf="${myconf} --enable-only64bit" - - # Don't use mpicc unless the user asked for it (bug #258832) - if ! use mpi; then - myconf="${myconf} --without-mpicc" - fi - - econf ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS FAQ.txt NEWS README* - - pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux - - if [[ ${CHOST} == *-darwin* ]] ; then - # fix install_names on shared libraries, can't turn them into bundles, - # as dyld won't load them any more then, bug #306467 - local l - for l in "${ED}"/usr/lib/valgrind/*.so ; do - install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}" - done - fi -} - -pkg_postinst() { - elog "Valgrind will not work if glibc does not have debug symbols." - elog "To fix this you can add splitdebug to FEATURES in make.conf" - elog "and remerge glibc. See:" - elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"; - elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"; - elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"; -}
