commit: 692265a7c229589d0529db3982dded2e8de1f8a1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Feb 3 16:15:41 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 3 16:51:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=692265a7
dev-util/valgrind: drop 3.19.0, 3.20.0 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/valgrind/Manifest | 1 - .../valgrind/files/valgrind-3.19.0-clang-15.patch | 33 ------ dev-util/valgrind/valgrind-3.19.0.ebuild | 129 --------------------- dev-util/valgrind/valgrind-3.20.0.ebuild | 129 --------------------- 4 files changed, 292 deletions(-) diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest index c7f5d50fd001..28151efc39af 100644 --- a/dev-util/valgrind/Manifest +++ b/dev-util/valgrind/Manifest @@ -1,3 +1,2 @@ -DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a33a083505b42adaa94ee3af659cbe073e516bc98163ef56233e6cd9de2125839b71ee443fbc0db6557dcb35a6c05280 SHA512 f720a89dc4c4989cc5714bff9efe97529f71990bcfad7a92b889ce099c4326d6da07fa4d5fbab2e9125e20f352354f6178471e49e419b613a3c82c2a1c667ab2 DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 12642e4f85c7b17bdb892221f74d80ce919554ffde3cdfa79ca27f4c5f8b48dac699084b8296b5cea285b5af660a0bc51c42b108a725be60002b14f0fda7eac7 SHA512 70dd20f15b159ffbf016c118046ee42160dd867415f1c565a92995952b1720ec36fc48557f6b523d28e6f675d62df10a4022e900fa4a104626b9e6ed6fe9ad6d diff --git a/dev-util/valgrind/files/valgrind-3.19.0-clang-15.patch b/dev-util/valgrind/files/valgrind-3.19.0-clang-15.patch deleted file mode 100644 index 77b2e8b091a4..000000000000 --- a/dev-util/valgrind/files/valgrind-3.19.0-clang-15.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://sourceware.org/git/?p=valgrind.git;a=commit;h=1dbc46750f7f716ae3b9cf718380df77422379da -https://bugs.gentoo.org/869320 - -From: Paul Floyd <[email protected]> -Date: Tue, 19 Apr 2022 22:03:01 +0200 -Subject: [PATCH] Bug 452779 Valgrind fails to build on FreeBSD 13.0 with - llvm-devel (15.0.0) - -This fixes building. - -I may make the -lgcc and libgcc-sup conditonal on not using clang later. ---- a/Makefile.tool.am -+++ b/Makefile.tool.am -@@ -16,14 +16,14 @@ TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@ = \ - $(top_builddir)/VEX/libvex-@VGCONF_ARCH_SEC@-@[email protected] - endif - -- --TOOL_LDADD_COMMON = -lgcc \ -- $(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_PRI@-@[email protected] -+TOOL_LDADD_COMMON = -lgcc - TOOL_LDADD_@VGCONF_PLATFORM_PRI_CAPS@ = \ -- $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) $(TOOL_LDADD_COMMON) -+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_PRI_CAPS@) $(TOOL_LDADD_COMMON) \ -+ $(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_PRI@-@[email protected] - if VGCONF_HAVE_PLATFORM_SEC - TOOL_LDADD_@VGCONF_PLATFORM_SEC_CAPS@ = \ -- $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON) -+ $(TOOL_DEPENDENCIES_@VGCONF_PLATFORM_SEC_CAPS@) $(TOOL_LDADD_COMMON) \ -+ $(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_SEC@-@[email protected] - endif - - diff --git a/dev-util/valgrind/valgrind-3.19.0.ebuild b/dev-util/valgrind/valgrind-3.19.0.ebuild deleted file mode 100644 index f7e812e805cc..000000000000 --- a/dev-util/valgrind/valgrind-3.19.0.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic toolchain-funcs multilib pax-utils - -DESCRIPTION="An open-source memory debugger for GNU/Linux" -HOMEPAGE="https://valgrind.org"; -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"; - inherit git-r3 -else - SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"; - KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="mpi" - -DEPEND="mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -PATCHES=( - # Respect CFLAGS, LDFLAGS - "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch - "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch - "${FILESDIR}"/${PN}-3.19.0-clang-15.patch -) - -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 - - # Conditionally copy musl specific suppressions && apply patch - if use elibc_musl ; then - cp "${FILESDIR}/musl.supp" "${S}" || die - PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch ) - fi - - if [[ ${CHOST} == *-solaris* ]] ; then - # upstream doesn't support this, but we don't build with - # Sun/Oracle ld, we have a GNU toolchain, so get some things - # working the Linux/GNU way - find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \ - sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die - cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in - fi - - default - - # 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) - # -fstack-protector-all Fails same way as -fstack-protector/-fstack-protector-strong. - # Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it - # -fstack-protector-strong See -fstack-protector (bug #620402) - # -m64 -mx32 for multilib-portage, bug #398825 - # -ggdb3 segmentation fault on startup - # -flto* fails to build, bug #858509 - filter-flags -fomit-frame-pointer - filter-flags -fstack-protector - filter-flags -fstack-protector-all - filter-flags -fstack-protector-strong - filter-flags -m64 -mx32 - replace-flags -ggdb3 -ggdb2 - filter-lto - - if use amd64 || use ppc64; then - ! has_multilib_profile && myconf+=("--enable-only64bit") - fi - - # Force bitness on darwin, bug #306467 - use x64-macos && myconf+=("--enable-only64bit") - - # Don't use mpicc unless the user asked for it (bug #258832) - if ! use mpi; then - myconf+=("--without-mpicc") - fi - - econf "${myconf[@]}" -} - -src_install() { - default - - if [[ ${PV} == "9999" ]]; then - # Otherwise FAQ.txt won't exist: - emake -C docs FAQ.txt - mv docs/FAQ.txt . || die "Couldn't move FAQ.txt" - fi - - dodoc FAQ.txt - - 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"; -} diff --git a/dev-util/valgrind/valgrind-3.20.0.ebuild b/dev-util/valgrind/valgrind-3.20.0.ebuild deleted file mode 100644 index 5d8a7a3727cd..000000000000 --- a/dev-util/valgrind/valgrind-3.20.0.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic toolchain-funcs multilib pax-utils - -DESCRIPTION="An open-source memory debugger for GNU/Linux" -HOMEPAGE="https://valgrind.org"; -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://sourceware.org/git/${PN}.git"; - inherit git-r3 -else - SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"; - KEYWORDS="-* amd64 arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="mpi" - -DEPEND="mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" - -PATCHES=( - # Respect CFLAGS, LDFLAGS - "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch - "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch - "${FILESDIR}"/${P}-tests-clang16.patch -) - -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 - - # Conditionally copy musl specific suppressions && apply patch - if use elibc_musl ; then - cp "${FILESDIR}/musl.supp" "${S}" || die - PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch ) - fi - - if [[ ${CHOST} == *-solaris* ]] ; then - # upstream doesn't support this, but we don't build with - # Sun/Oracle ld, we have a GNU toolchain, so get some things - # working the Linux/GNU way - find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \ - sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die - cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in - fi - - default - - # 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) - # -fstack-protector-all Fails same way as -fstack-protector/-fstack-protector-strong. - # Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it - # -fstack-protector-strong See -fstack-protector (bug #620402) - # -m64 -mx32 for multilib-portage, bug #398825 - # -ggdb3 segmentation fault on startup - # -flto* fails to build, bug #858509 - filter-flags -fomit-frame-pointer - filter-flags -fstack-protector - filter-flags -fstack-protector-all - filter-flags -fstack-protector-strong - filter-flags -m64 -mx32 - replace-flags -ggdb3 -ggdb2 - filter-lto - - if use amd64 || use ppc64; then - ! has_multilib_profile && myconf+=("--enable-only64bit") - fi - - # Force bitness on darwin, bug #306467 - use x64-macos && myconf+=("--enable-only64bit") - - # Don't use mpicc unless the user asked for it (bug #258832) - if ! use mpi; then - myconf+=("--without-mpicc") - fi - - econf "${myconf[@]}" -} - -src_install() { - default - - if [[ ${PV} == "9999" ]]; then - # Otherwise FAQ.txt won't exist: - emake -C docs FAQ.txt - mv docs/FAQ.txt . || die "Couldn't move FAQ.txt" - fi - - dodoc FAQ.txt - - 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"; -}
