* [gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/files/, dev-util/valgrind/
@ 2016-04-16 8:51 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2016-04-16 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 3a0c640086917cd6ce03f9ce6e16003ad612dd4b
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 08:58:51 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 08:59:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a0c6400
dev-util/valgrind: add support for glibc 2.22, bug #580092
Package-Manager: portage-2.2.26
.../valgrind/files/valgrind-3.10.1-glibc-2.22.patch | 17 +++++++++++++++++
dev-util/valgrind/valgrind-3.10.1.ebuild | 7 +++++--
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch
new file mode 100644
index 0000000..aa44aec
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch
@@ -0,0 +1,17 @@
+diff -Naur valgrind-3.10.1.orig/configure.ac valgrind-3.10.1/configure.ac
+--- valgrind-3.10.1.orig/configure.ac 2016-04-16 04:24:22.285314910 -0400
++++ valgrind-3.10.1/configure.ac 2016-04-16 04:39:03.437329726 -0400
+@@ -1032,6 +1032,13 @@
+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ ;;
++ 2.22)
++ AC_MSG_RESULT(2.22 family)
++ AC_DEFINE([GLIBC_2_22], 1, [Define to 1 if you're using glibc 2.22.x])
++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
++ ;;
+ darwin)
+ AC_MSG_RESULT(Darwin)
+ AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/dev-util/valgrind/valgrind-3.10.1.ebuild b/dev-util/valgrind/valgrind-3.10.1.ebuild
index 7dd15a4..b36dfc6 100644
--- a/dev-util/valgrind/valgrind-3.10.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.10.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="4"
+EAPI="5"
inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
DESCRIPTION="An open-source memory debugger for GNU/Linux"
@@ -46,6 +46,9 @@ src_prepare() {
# glibc 2.21 fix. Bug #554808.
epatch "${FILESDIR}"/${PN}-3.10.1-glibc-2.21.patch
+ # glibc 2.22 fix. Bug #580092
+ epatch "${FILESDIR}"/${PN}-3.10.1-glibc-2.22.patch
+
# Allow users to test their own patches
epatch_user
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/files/, dev-util/valgrind/
@ 2021-07-02 22:01 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2021-07-02 22:01 UTC (permalink / raw
To: gentoo-commits
commit: 0a4c5e8d86b6cef5b24b5a0cdea494f9857531a0
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 2 20:22:39 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 2 22:01:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a4c5e8d
dev-util/valgrind: Add patch to support linking with LLD
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
dev-util/valgrind/files/valgrind-3.17.0-lld.patch | 77 +++++++++++++++++++++++
dev-util/valgrind/valgrind-3.17.0.ebuild | 2 +
2 files changed, 79 insertions(+)
diff --git a/dev-util/valgrind/files/valgrind-3.17.0-lld.patch b/dev-util/valgrind/files/valgrind-3.17.0-lld.patch
new file mode 100644
index 00000000000..56a7c0f72f4
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.17.0-lld.patch
@@ -0,0 +1,77 @@
+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.17.0.ebuild b/dev-util/valgrind/valgrind-3.17.0.ebuild
index 890f4104452..148f504a570 100644
--- a/dev-util/valgrind/valgrind-3.17.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.17.0.ebuild
@@ -33,6 +33,8 @@ src_prepare() {
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/files/, dev-util/valgrind/
@ 2022-09-10 1:57 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-09-10 1:57 UTC (permalink / raw
To: gentoo-commits
commit: 80b1fc1e8b31f1e0b775cc2b856a64e7e058587f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 01:57:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 01:57:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b1fc1e
dev-util/valgrind: fix build w/ Clang 15
Closes: https://bugs.gentoo.org/869320
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../valgrind/files/valgrind-3.19.0-clang-15.patch | 33 ++++++++++++++++++++++
dev-util/valgrind/valgrind-3.19.0.ebuild | 19 +++++++------
dev-util/valgrind/valgrind-9999.ebuild | 18 ++++++------
3 files changed, 52 insertions(+), 18 deletions(-)
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
new file mode 100644
index 000000000000..77b2e8b091a4
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.19.0-clang-15.patch
@@ -0,0 +1,33 @@
+https://sourceware.org/git/?p=valgrind.git;a=commit;h=1dbc46750f7f716ae3b9cf718380df77422379da
+https://bugs.gentoo.org/869320
+
+From: Paul Floyd <pjfloyd@wanadoo.fr>
+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@-@VGCONF_OS@.a
+ endif
+
+-
+-TOOL_LDADD_COMMON = -lgcc \
+- $(top_builddir)/coregrind/libgcc-sup-@VGCONF_ARCH_PRI@-@VGCONF_OS@.a
++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@-@VGCONF_OS@.a
+ 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@-@VGCONF_OS@.a
+ endif
+
+
diff --git a/dev-util/valgrind/valgrind-3.19.0.ebuild b/dev-util/valgrind/valgrind-3.19.0.ebuild
index 7e7417e90831..14e4020342ba 100644
--- a/dev-util/valgrind/valgrind-3.19.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.19.0.ebuild
@@ -22,6 +22,13 @@ 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
@@ -29,15 +36,10 @@ src_prepare() {
# 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
-
- # conditionally copy musl specific suppressions && apply patch
+ # Conditionally copy musl specific suppressions && apply patch
if use elibc_musl ; then
cp "${FILESDIR}/musl.supp" "${S}" || die
- eapply "${FILESDIR}/valgrind-3.13.0-malloc.patch"
+ PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch )
fi
if [[ ${CHOST} == *-solaris* ]] ; then
@@ -49,8 +51,7 @@ src_prepare() {
cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
fi
- # Allow users to test their own patches
- eapply_user
+ default
# Regenerate autotools files
eautoreconf
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index 7e7417e90831..aed73f6be21b 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -22,6 +22,12 @@ 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
+)
+
src_prepare() {
# Correct hard coded doc location
sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
@@ -29,15 +35,10 @@ src_prepare() {
# 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
-
- # conditionally copy musl specific suppressions && apply patch
+ # Conditionally copy musl specific suppressions && apply patch
if use elibc_musl ; then
cp "${FILESDIR}/musl.supp" "${S}" || die
- eapply "${FILESDIR}/valgrind-3.13.0-malloc.patch"
+ PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch )
fi
if [[ ${CHOST} == *-solaris* ]] ; then
@@ -49,8 +50,7 @@ src_prepare() {
cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
fi
- # Allow users to test their own patches
- eapply_user
+ default
# Regenerate autotools files
eautoreconf
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/files/, dev-util/valgrind/
@ 2022-11-22 20:16 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-11-22 20:16 UTC (permalink / raw
To: gentoo-commits
commit: 3b63bb5b479ef0c7e014d4125bc4cc5317cee14b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 20:10:40 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 20:10:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b63bb5b
dev-util/valgrind: backport test fix for clang 16
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/valgrind-3.20.0-tests-clang16.patch | 23 ++++++++++++++++++++++
dev-util/valgrind/valgrind-3.20.0.ebuild | 1 +
2 files changed, 24 insertions(+)
diff --git a/dev-util/valgrind/files/valgrind-3.20.0-tests-clang16.patch b/dev-util/valgrind/files/valgrind-3.20.0-tests-clang16.patch
new file mode 100644
index 000000000000..01d51ba5f9ad
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.20.0-tests-clang16.patch
@@ -0,0 +1,23 @@
+https://bugs.kde.org/show_bug.cgi?id=462007
+https://sourceware.org/git/?p=valgrind.git;a=commit;h=0811a612dd7ce0c02a5dd699b34e660c742df8fe
+
+From 0811a612dd7ce0c02a5dd699b34e660c742df8fe Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Fri, 18 Nov 2022 20:12:06 +0100
+Subject: [PATCH 1/1] Implicit int in none/tests/faultstatus.c
+
+There is a definition in faultstatus.c that is not accepted by
+C99 compilers (implicit ints were removed in that language revision).
+
+https://bugs.kde.org/show_bug.cgi?id=462007
+--- a/none/tests/faultstatus.c
++++ b/none/tests/faultstatus.c
+@@ -190,7 +190,7 @@ int main()
+ return 0;
+ }
+
+-static volatile s_zero;
++static volatile int s_zero;
+
+ static int zero()
+ {
diff --git a/dev-util/valgrind/valgrind-3.20.0.ebuild b/dev-util/valgrind/valgrind-3.20.0.ebuild
index aed73f6be21b..6fc8047bd5a3 100644
--- a/dev-util/valgrind/valgrind-3.20.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0.ebuild
@@ -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() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/files/, dev-util/valgrind/
@ 2023-01-23 1:11 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-01-23 1:11 UTC (permalink / raw
To: gentoo-commits
commit: a87a1eec3f51d12790b03bc68c3d5690200ea0a3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 01:09:44 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 01:09:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87a1eec
dev-util/valgrind: add another musl patch
Without this, I got nonsensical results on musl on e.g. 'valgrind emerge'
within python-exec, as it couldn't handle fclose() properly.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/valgrind-3.20.0-musl-interpose.patch | 30 ++++++++++++++++++++++
dev-util/valgrind/valgrind-3.20.0-r1.ebuild | 5 +++-
dev-util/valgrind/valgrind-9999.ebuild | 5 +++-
3 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch b/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch
new file mode 100644
index 000000000000..6ede22f8b5ec
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.20.0-musl-interpose.patch
@@ -0,0 +1,30 @@
+https://bugs.kde.org/show_bug.cgi?id=435441
+
+From 460d0c9a6c27edfffed8ced623cecf64466619f2 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Thu, 4 Nov 2021 14:26:40 -0700
+Subject: [PATCH] Bug 435441 - Handle weak symbols as global for redirection
+
+Weak symbols are global but with lower precedence, so they should
+be handled the same way as global symbols during malloc replacement.
+
+This fixes valgrind on musl 1.2.2 when it is not patched with a
+soname (as is done on Alpine Linux).
+
+https://bugs.kde.org/show_bug.cgi?id=435441
+--- a/coregrind/m_debuginfo/readelf.c
++++ b/coregrind/m_debuginfo/readelf.c
+@@ -429,7 +429,8 @@ Bool get_elf_symbol_info (
+ }
+ # endif
+
+- if (ELFXX_ST_BIND(sym->st_info) == STB_GLOBAL) {
++ if (ELFXX_ST_BIND(sym->st_info) == STB_GLOBAL
++ || ELFXX_ST_BIND(sym->st_info) == STB_WEAK) {
+ *is_global_out = True;
+ }
+
+--
+2.32.0
+
+
diff --git a/dev-util/valgrind/valgrind-3.20.0-r1.ebuild b/dev-util/valgrind/valgrind-3.20.0-r1.ebuild
index 0be352c52d9b..0268876b1061 100644
--- a/dev-util/valgrind/valgrind-3.20.0-r1.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0-r1.ebuild
@@ -37,7 +37,10 @@ src_prepare() {
sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
if use elibc_musl ; then
- PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch )
+ PATCHES+=(
+ "${FILESDIR}"/${PN}-3.13.0-malloc.patch
+ "${FILESDIR}"/${PN}-3.20.0-musl-interpose.patch
+ )
fi
if [[ ${CHOST} == *-solaris* ]] ; then
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index 82cd1992cc4f..b690f11f1222 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -36,7 +36,10 @@ src_prepare() {
sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
if use elibc_musl ; then
- PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch )
+ PATCHES+=(
+ "${FILESDIR}"/${PN}-3.13.0-malloc.patch
+ "${FILESDIR}"/${PN}-3.20.0-musl-interpose.patch
+ )
fi
if [[ ${CHOST} == *-solaris* ]] ; then
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/files/, dev-util/valgrind/
@ 2023-01-30 3:27 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-01-30 3:27 UTC (permalink / raw
To: gentoo-commits
commit: 47e9795efeaedaf611cc959b1f8acaa51bb2f1f5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 02:14:31 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 03:24:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e9795e
dev-util/valgrind: fix tests w/ gcc 13
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../valgrind/files/valgrind-3.20.0-gcc-13.patch | 44 ++++++++++++++++++++++
dev-util/valgrind/valgrind-3.20.0-r2.ebuild | 1 +
2 files changed, 45 insertions(+)
diff --git a/dev-util/valgrind/files/valgrind-3.20.0-gcc-13.patch b/dev-util/valgrind/files/valgrind-3.20.0-gcc-13.patch
new file mode 100644
index 000000000000..3d3644f85fc1
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.20.0-gcc-13.patch
@@ -0,0 +1,44 @@
+https://sourceware.org/git/?p=valgrind.git;a=commit;h=dee222c6e818ca43ac45952fc8a020f445d98781
+https://sourceware.org/git/?p=valgrind.git;a=commit;h=3155bacf26237beb65edb4a572402492b2f1b050
+
+From dee222c6e818ca43ac45952fc8a020f445d98781 Mon Sep 17 00:00:00 2001
+From: Paul Floyd <pjfloyd@wanadoo.fr>
+Date: Fri, 27 Jan 2023 08:30:41 +0100
+Subject: [PATCH] Bug 464859 - Build failures with GCC-13 (drd tsan_unittest)
+
+Patch submitted by
+ Khem Raj <raj.khem@gmail.com>
+--- a/drd/tests/tsan_thread_wrappers_pthread.h
++++ b/drd/tests/tsan_thread_wrappers_pthread.h
+@@ -55,6 +55,7 @@
+ #define NO_TLS
+ #endif
+
++#include <cstdint>
+ #include <string>
+ using namespace std;
+
+--
+2.31.1
+
+From 3155bacf26237beb65edb4a572402492b2f1b050 Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Sat, 28 Jan 2023 21:53:44 +0100
+Subject: [PATCH] tsan_thread_wrappers_pthread.h: Only include cstdint for
+ C++11
+
+Fixes build on older g++.
+--- a/drd/tests/tsan_thread_wrappers_pthread.h
++++ b/drd/tests/tsan_thread_wrappers_pthread.h
+@@ -55,7 +55,9 @@
+ #define NO_TLS
+ #endif
+
++#if __cplusplus >= 201103L
+ #include <cstdint>
++#endif
+ #include <string>
+ using namespace std;
+
+--
+2.31.1
diff --git a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
index 4c27c1d3c9b1..131bcaad0a1a 100644
--- a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${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
+ "${FILESDIR}"/${P}-gcc-13.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-30 3:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-10 1:57 [gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/files/, dev-util/valgrind/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-01-30 3:27 Sam James
2023-01-23 1:11 Sam James
2022-11-22 20:16 Sam James
2021-07-02 22:01 Matt Turner
2016-04-16 8:51 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox