commit: 02d1a49f0e132101104b4d803f78af6a951ab0e5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Oct 28 10:43:08 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 28 10:43:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d1a49f
dev-util/valgrind: drop 3.16.1, 3.17.0 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/valgrind/Manifest | 2 - dev-util/valgrind/files/valgrind-3.17.0-lld.patch | 77 -------------- dev-util/valgrind/valgrind-3.16.1.ebuild | 119 --------------------- dev-util/valgrind/valgrind-3.17.0.ebuild | 121 ---------------------- 4 files changed, 319 deletions(-) diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest index 1caffcb2df1d..756f26086c14 100644 --- a/dev-util/valgrind/Manifest +++ b/dev-util/valgrind/Manifest @@ -1,5 +1,3 @@ -DIST valgrind-3.16.1.tar.bz2 16262776 BLAKE2B 1c333c26827f7a8356869e8758da9dd6a7444642ac4f6377c84fdab8349b9cee1e9bf2cf2eb86043c4feffab342dd97da20e76d7566d0296189e6ea8483a8c65 SHA512 2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950 -DIST valgrind-3.17.0.tar.bz2 16459075 BLAKE2B 96569db9bc3c25ca195a4caa64da6e96b9bff7edd82727fccccaa8307162e29f4e150386c7c9611152fc1afde609d0922aa84067957b72dff03810ee23045e9c SHA512 94de78942a7059e1ab84d1c0c0b8f3efd1c2d15c70b97bc7edc8136812778adb6f8187149d53a60a8c6a7c8b40534f9be5cfed0eb3c0c314545b681f950b108f DIST valgrind-3.18.1.tar.bz2 16149159 BLAKE2B a98322e4c12ae1bc495659217bd398b85e459288e775ba5f543b9ce1faa5bdfc17791178c0e7b9703a31588cc4c7cbde814b7a43b2ec76e7362e2aeeb100d935 SHA512 a03b5cd7eafab4a1cea07f46464c1546ae1cb3d106649626b1e55658badf90e58d1f3854a38a33d5dffd8237f5555ae7e1f27a4b40e06254f87825c7fc61b59b DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a33a083505b42adaa94ee3af659cbe073e516bc98163ef56233e6cd9de2125839b71ee443fbc0db6557dcb35a6c05280 SHA512 f720a89dc4c4989cc5714bff9efe97529f71990bcfad7a92b889ce099c4326d6da07fa4d5fbab2e9125e20f352354f6178471e49e419b613a3c82c2a1c667ab2 DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b diff --git a/dev-util/valgrind/files/valgrind-3.17.0-lld.patch b/dev-util/valgrind/files/valgrind-3.17.0-lld.patch deleted file mode 100644 index 56a7c0f72f46..000000000000 --- a/dev-util/valgrind/files/valgrind-3.17.0-lld.patch +++ /dev/null @@ -1,77 +0,0 @@ -https://bugs.kde.org/show_bug.cgi?id=439046 ---- -diff --git a/configure.ac b/configure.ac -index 4582fb5d0..63fd6c25e 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -2639,30 +2639,52 @@ CFLAGS=$safe_CFLAGS - # will reside. -Ttext aligns just the .text section start (but not any - # other section). - # --# So test for -Ttext-segment which is supported by all bfd ld versions -+# LLVM ld.lld 10.0 changed the semantics of its -Ttext. See "Breaking changes" -+# in https://releases.llvm.org/10.0.0/tools/lld/docs/ReleaseNotes.html -+# The --image-base option (since version 6.0?) provides the semantics needed. -+# -Ttext-segment generates an error, but -Ttext now more closely -+# follows the GNU (bfd) ld's -Ttext. -+# -+# So test first for --image-base support, and if that fails then -+# for -Ttext-segment which is supported by all bfd ld versions - # and use that if it exists. If it doesn't exist it must be an older - # version of gold and we can fall back to using -Ttext which has the - # right semantics. - --AC_MSG_CHECKING([if the linker accepts -Wl,-Ttext-segment]) -- - safe_CFLAGS=$CFLAGS --CFLAGS="-static -nodefaultlibs -nostartfiles -Wl,-Ttext-segment=$valt_load_address_pri_norml -Werror" -+AC_MSG_CHECKING([if the linker accepts -Wl,--image-base]) -+ -+CFLAGS="-static -nodefaultlibs -nostartfiles -Wl,--image-base=$valt_load_address_pri_norml -Werror" - - AC_LINK_IFELSE( - [AC_LANG_SOURCE([int _start () { return 0; }])], - [ - linker_using_t_text="no" -- AC_SUBST([FLAG_T_TEXT], ["-Ttext-segment"]) -+ AC_SUBST([FLAG_T_TEXT], ["--image-base"]) - AC_MSG_RESULT([yes]) - ], [ -- linker_using_t_text="yes" -- AC_SUBST([FLAG_T_TEXT], ["-Ttext"]) - AC_MSG_RESULT([no]) -+ -+ AC_MSG_CHECKING([if the linker accepts -Wl,-Ttext-segment]) -+ -+ CFLAGS="-static -nodefaultlibs -nostartfiles -Wl,-Ttext-segment=$valt_load_address_pri_norml -Werror" -+ -+ AC_LINK_IFELSE( -+ [AC_LANG_SOURCE([int _start () { return 0; }])], -+ [ -+ linker_using_t_text="no" -+ AC_SUBST([FLAG_T_TEXT], ["-Ttext-segment"]) -+ AC_MSG_RESULT([yes]) -+ ], [ -+ linker_using_t_text="yes" -+ AC_SUBST([FLAG_T_TEXT], ["-Ttext"]) -+ AC_MSG_RESULT([no]) -+ ]) - ]) -+ - CFLAGS=$safe_CFLAGS - --# If the linker only supports -Ttext (not -Ttext-segment) then we will -+# If the linker only supports -Ttext (not -Ttext-segment or --image-base) then we will - # have to strip any build-id ELF NOTEs from the statically linked tools. - # Otherwise the build-id NOTE might end up at the default load address. - # (Pedantically if the linker is gold then -Ttext is fine, but newer -@@ -2688,7 +2710,7 @@ AC_LINK_IFELSE( - AC_MSG_RESULT([no]) - ]) - else --AC_MSG_NOTICE([ld -Ttext-segment used, no need to strip build-id NOTEs.]) -+AC_MSG_NOTICE([ld --image-base or -Ttext-segment used, no need to strip build-id NOTEs.]) - AC_SUBST([FLAG_NO_BUILD_ID], [""]) - fi - CFLAGS=$safe_CFLAGS --- diff --git a/dev-util/valgrind/valgrind-3.16.1.ebuild b/dev-util/valgrind/valgrind-3.16.1.ebuild deleted file mode 100644 index 268884944a78..000000000000 --- a/dev-util/valgrind/valgrind-3.16.1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic toolchain-funcs multilib pax-utils - -DESCRIPTION="An open-source memory debugger for GNU/Linux" -HOMEPAGE="https://www.valgrind.org"; -LICENSE="GPL-2" -SLOT="0" -IUSE="mpi" - -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 - -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 - eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch - - eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch - - 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 - - # Allow users to test their own patches - eapply_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) - # -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 - 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 - - 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.17.0.ebuild b/dev-util/valgrind/valgrind-3.17.0.ebuild deleted file mode 100644 index d1d6fdd5f4cc..000000000000 --- a/dev-util/valgrind/valgrind-3.17.0.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic toolchain-funcs multilib pax-utils - -DESCRIPTION="An open-source memory debugger for GNU/Linux" -HOMEPAGE="https://www.valgrind.org"; -LICENSE="GPL-2" -SLOT="0" -IUSE="mpi" - -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 - -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 - eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch - - eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch - - eapply "${FILESDIR}"/${PN}-3.17.0-lld.patch - - 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 - - # Allow users to test their own patches - eapply_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) - # -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 - 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 - - 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"; -}
