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 767241584AD for ; Sat, 10 May 2025 16:48:08 +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 3A314342FF7 for ; Sat, 10 May 2025 16:48:08 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 342A4110278; Sat, 10 May 2025 16:48:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 295A3110278 for ; Sat, 10 May 2025 16:48:07 +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 CFC0D342FF7 for ; Sat, 10 May 2025 16:48:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7727F1E64 for ; Sat, 10 May 2025 16:48:05 +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: <1746895662.0393cf0ea4137b4759164f680d45b27fc2e501c6.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.25.0_p1.ebuild X-VCS-Directories: dev-debug/valgrind/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0393cf0ea4137b4759164f680d45b27fc2e501c6 X-VCS-Branch: master Date: Sat, 10 May 2025 16:48:05 +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: 98b34634-93ea-4dfb-8da1-60b837da413a X-Archives-Hash: eea457fd60618e240b82e55d52685ded commit: 0393cf0ea4137b4759164f680d45b27fc2e501c6 Author: Sam James gentoo org> AuthorDate: Sat May 10 16:29:39 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 10 16:47:42 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0393cf0e dev-debug/valgrind: add 3.25.0_p1 Mark Wielaard (4): Set version to 3.25.1.GIT Prepare NEWS for branch 3.25 fixes mount syscall param filesystemtype may be NULL Add workaround for missing riscv_hwprobe syscall (258) Paul Floyd (2): FreeBSD close_range syscall Bug 503641 - close_range syscalls started failing with 3.25.0 Signed-off-by: Sam James gentoo.org> dev-debug/valgrind/Manifest | 1 + dev-debug/valgrind/valgrind-3.25.0_p1.ebuild | 200 +++++++++++++++++++++++++++ 2 files changed, 201 insertions(+) diff --git a/dev-debug/valgrind/Manifest b/dev-debug/valgrind/Manifest index cd65e4eb622b..72ec86e4d564 100644 --- a/dev-debug/valgrind/Manifest +++ b/dev-debug/valgrind/Manifest @@ -2,5 +2,6 @@ DIST valgrind-3.24.0-patches-1.tar.xz 10112 BLAKE2B 83e3b5970b4b4af60dacd90d0d71 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 +DIST valgrind-3.25.0-patches-1.tar.xz 5108 BLAKE2B 37062cec7e76e4416d7fd6a64bb4bcc9ca58edcb2abddbb66e7eb84e804d0a8c036954d74de5036f4925577242dc2218539a7cdaf6a675fe03b033fda616b50e SHA512 0d51b7fcde6045708e7884ff4c88787f395f2817381e3a019a394f835b3a176bf8a92634d15304870da700d7cf9042b5bf9766eb24b873a0030cda48bb0958ef DIST valgrind-3.25.0.tar.bz2 17723002 BLAKE2B 36505779555ccb52c36b0823e1317203011b020656207cd5ca0c06fd9a8d719d1ec66c89e15b0096c863edfbecd0fb31540e00ea3d75637947575cdae0a39684 SHA512 1fc649ae346d5106b69fe2cf8b494fa441d63f576b16e62d90e547f760851e427a173b6d03c4076a8ae13df66717f66631f4dc6769ede15f5521bd95099a649d DIST valgrind-3.25.0.tar.bz2.asc 488 BLAKE2B c1e8d129ad284514eddab6248410c3c88121ab27b3eaa3f56e05316d29303e21bb34fd3ea23b812b881a1ef220bd3acfcfcb1ff54232690ca47fc2814f546153 SHA512 a33dfbe1abb12c9f36a9c8ea03c9de3b51670d155ecbc7dce0aa50bf9f85838d9240eccbb53ab07a11355c82405ccf4168459cb902423b9daffb13b9648ea9af diff --git a/dev-debug/valgrind/valgrind-3.25.0_p1.ebuild b/dev-debug/valgrind/valgrind-3.25.0_p1.ebuild new file mode 100644 index 000000000000..fabc10e80fda --- /dev/null +++ b/dev-debug/valgrind/valgrind-3.25.0_p1.ebuild @@ -0,0 +1,200 @@ +# 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 + https://git.sr.ht/~sourceware/valgrind + " + 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 ~riscv ~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" +}