From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9F42B1584AD for ; Thu, 01 May 2025 06:07:07 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 89F0134308C for ; Thu, 01 May 2025 06:07:07 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 895F711036B; Thu, 01 May 2025 06:07:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 7D08211036B for ; Thu, 01 May 2025 06:07:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22CED340C76 for ; Thu, 01 May 2025 06:07:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B01A52511 for ; Thu, 01 May 2025 06:07:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1746079527.a3f06e77caa75b4c131d44fb32647cba699479dc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-debug/valgrind/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-debug/valgrind/Manifest dev-debug/valgrind/valgrind-3.24.0_p2.ebuild X-VCS-Directories: dev-debug/valgrind/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a3f06e77caa75b4c131d44fb32647cba699479dc X-VCS-Branch: master Date: Thu, 01 May 2025 06:07:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c8a7c04d-30b8-4e4b-9348-7855e6922fd7 X-Archives-Hash: a3cfeb04737c1cc5c8b02315a7c7c2c4 commit: a3f06e77caa75b4c131d44fb32647cba699479dc Author: Sam James gentoo org> AuthorDate: Thu May 1 06:05:27 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu May 1 06:05:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3f06e77 dev-debug/valgrind: drop 3.24.0_p2 Signed-off-by: Sam James gentoo.org> dev-debug/valgrind/Manifest | 1 - dev-debug/valgrind/valgrind-3.24.0_p2.ebuild | 197 --------------------------- 2 files changed, 198 deletions(-) diff --git a/dev-debug/valgrind/Manifest b/dev-debug/valgrind/Manifest index a496e79da6ba..cd65e4eb622b 100644 --- a/dev-debug/valgrind/Manifest +++ b/dev-debug/valgrind/Manifest @@ -1,5 +1,4 @@ DIST valgrind-3.24.0-patches-1.tar.xz 10112 BLAKE2B 83e3b5970b4b4af60dacd90d0d7153359ece8f207f99e3325c8504a0fca123db3b803f2c745ed184f9aa3a4a54d1f922067dd060ce8d18d8b8bd4b936f676602 SHA512 054f5c9ee2676f172e896838e6fb50b1e51a842a8ede2dacb7def01c786bbd874f8099d9bd9ddb0ae88c7d1b32686dee80631ea7f6e27b0efd78a6c1fbdaaaec -DIST valgrind-3.24.0-patches-2.tar.xz 17900 BLAKE2B 50304bb6cd0d41cee9605f3ad2af48f8ae90bdda0dc043f73c510a5c75fbe540b69fb2c24f3decf68302c6738c6b8243f43b793389b1f843ad7e5771f61da739 SHA512 ba09bb7b655026825267fcbbb08fc3593d98596daf47f088c1fe9825347827ee3351af2caa48008f1c6af33a550da5cb7da9aa4db5dba7aca04b0028c7e4e331 DIST valgrind-3.24.0-patches-3.tar.xz 19236 BLAKE2B 9d75207e5d3e772ca150e48625d737e7206dbf75e6e56c5ff648107e75872eba37b381405edfb97156ad999ea5d5d4339ae5643e70fe8655d0855783063ff33a SHA512 2d0bfd06213e0ba6ab9075ce27fb1b9cd2c8ab75bfa9e43a3e26d224b9b36fe5dbb4a0116eeec693c16389f084f3cb363e72675a2c5e0e46f8efbab117f0b57e DIST valgrind-3.24.0.tar.bz2 16632387 BLAKE2B e11ad08f0062bd39788cd71d7ce058dec7a7207fbbe25f0dbfc7fb5735667809681cec2c843659553fbd49bcc6c71bdb93d87ffda3589247e4ee87c98fe51332 SHA512 6c131ff93d1f432d8362a47285cc377cba224ebca4f18e922c6156f7736d43020ece14d8fd16913498ab00fd18c85e2042a7d5351c3901e80413c584ebb406f3 DIST valgrind-3.24.0.tar.bz2.asc 488 BLAKE2B f6307d10ee3ca26d837bf00471d179655ddbb0137920e175767a9d875aae355cea6727112deb788300a5196d94500bf9b341f8c70d46a1f83c40ae579ad45431 SHA512 37e9188756940960dcfe771d10275de7759ae652c94e710618948a8b366f66f3453f77b7751df0010b58304b203d7b3b56ac7a671d142d620916689ce5c84ae0 diff --git a/dev-debug/valgrind/valgrind-3.24.0_p2.ebuild b/dev-debug/valgrind/valgrind-3.24.0_p2.ebuild deleted file mode 100644 index 1a9c52b3ea9d..000000000000 --- a/dev-debug/valgrind/valgrind-3.24.0_p2.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# The Valgrind upstream maintainer also maintains it in Fedora and will -# backport fixes there which haven't yet made it into a release. Keep an eye -# on it for fixes we should cherry-pick too: -# https://src.fedoraproject.org/rpms/valgrind/tree/rawhide -# -# Also check the ${PV}_STABLE branch upstream for backports. - -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 - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/valgrind.gpg - inherit verify-sig - - MY_P="${P/_rc/.RC}" - MY_P="${MY_P%%_p*}" - VALGRIND_PATCH_TARBALL="${MY_P}-patches-${PV##*_p}" - SRC_URI=" - https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2 - verify-sig? ( https://sourceware.org/pub/valgrind/${MY_P}.tar.bz2.asc ) - " - # Rollups of backports on ${PV}_STABLE branch upstream. This branch - # is usually announced on the mailing list and distros are encouraged - # to pull from it regularly. - if [[ ${PV} == *_p* ]] ; then - SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${VALGRIND_PATCH_TARBALL}.tar.xz" - fi - - S="${WORKDIR}"/${MY_P} - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - fi -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="mpi" - -DEPEND="mpi? ( virtual/mpi )" -RDEPEND="${DEPEND}" -if [[ ${PV} == 9999 ]] ; then - # Needed for man pages - BDEPEND+=" - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - " -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-valgrind )" -fi - -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.21.0-glibc-2.34-suppressions.patch -) - -QA_CONFIG_IMPL_DECL_SKIP+=( - # "checking if gcc accepts nested functions" but clang cannot handle good - # errors and reports both "function definition is not allowed here" and - # -Wimplicit-function-declaration. bug #900396 - foo - # FreeBSD function, bug #932822 - aio_readv -) - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - elif use verify-sig ; then - # Needed for downloaded patch (which is unsigned, which is fine) - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.bz2{,.asc} - fi - - default -} - -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 - - 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 - - if [[ ${PV} != 9999 && -d "${WORKDIR}"/${VALGRIND_PATCH_TARBALL} ]] ; then - PATCHES+=( "${WORKDIR}"/${VALGRIND_PATCH_TARBALL} ) - fi - - default - - eautoreconf -} - -src_configure() { - local myconf=( - --with-gdbscripts-dir="${EPREFIX}"/usr/share/gdb/auto-load - ) - - tc-is-lto && myconf+=( --enable-lto ) - - # 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 - # -fharden-control-flow-redundancy: breaks runtime ('jump to the invalid address stated on the next line') - filter-flags -fomit-frame-pointer - filter-flags -fstack-protector - filter-flags -fstack-protector-all - filter-flags -fstack-protector-strong - filter-flags -m64 -mx32 - filter-flags -fsanitize -fsanitize=* - filter-flags -fharden-control-flow-redundancy - append-cflags $(test-flags-CC -fno-harden-control-flow-redundancy) - 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_test() { - # fxsave.o, tronical.o have textrels - # -fno-strict-aliasing: https://bugs.kde.org/show_bug.cgi?id=486093 - emake CFLAGS="${CFLAGS} -fno-strict-aliasing" LDFLAGS="${LDFLAGS} -Wl,-z,notext" check -} - -src_install() { - if [[ ${PV} == 9999 ]]; then - # TODO: Could do HTML docs too with 'all-docs' - emake -C docs man-pages FAQ.txt - mv docs/FAQ.txt . || die "Couldn't move FAQ.txt" - fi - - default - - dodoc FAQ.txt - - pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux - - # See README_PACKAGERS - dostrip -x /usr/libexec/valgrind/vgpreload* /usr/$(get_libdir)/valgrind/* - - 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 libc (e.g. 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/214065" - elog "https://bugs.gentoo.org/274771" - elog "https://bugs.gentoo.org/388703" -}