[gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/

["Sam James" <sam@gentoo.org>]

commit:     b9589621d3748e5bb7486ee14d32f87ec7bcc503
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 23:07:02 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 23:07:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9589621

dev-util/valgrind: don't strip some components

Per README_PACKAGERS, this breaks Valgrind at least a bit, and sometimes entirely.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{valgrind-9999.ebuild => valgrind-3.20.0-r1.ebuild}        | 10 +++++++---
 dev-util/valgrind/valgrind-9999.ebuild                         |  9 ++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-3.20.0-r1.ebuild
similarity index 92%
copy from dev-util/valgrind/valgrind-9999.ebuild
copy to dev-util/valgrind/valgrind-3.20.0-r1.ebuild
index aed73f6be21b..beb459c7a08c 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,6 +26,7 @@ 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() {
@@ -108,6 +109,9 @@ src_install() {
 
 	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
@@ -119,9 +123,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
+	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 "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-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index aed73f6be21b..13560a006c12 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -108,6 +108,9 @@ src_install() {
 
 	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
@@ -119,9 +122,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Valgrind will not work if glibc does not have debug symbols."
+	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 "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"