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

2023-02-08 Thread Sam James 
commit: 18bb41026c3e39a62c2d832afb81108b5bd1f83e
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Feb  8 16:52:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  8 17:14:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18bb4102

dev-util/valgrind: remove unused file

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29485
Signed-off-by: Sam James  gentoo.org>

 dev-util/valgrind/files/musl.supp | 47 ---
 1 file changed, 47 deletions(-)

diff --git a/dev-util/valgrind/files/musl.supp 
b/dev-util/valgrind/files/musl.supp
deleted file mode 100644
index 69adac7bb5da..
--- a/dev-util/valgrind/files/musl.supp
+++ /dev/null
@@ -1,47 +0,0 @@
-# From: https://git.alpinelinux.org/aports/tree/main/valgrind/
-# Suppressions for musl libc
-# See: https://www.openwall.com/lists/musl/2017/06/15/4
-
-{
-   musl-dynlink-false-positive1
-   Memcheck:Leak
-   fun:calloc
-   fun:load_direct_deps
-   fun:load_deps
-   fun:load_deps
-   fun:__dls3
-   fun:__dls2b
-   fun:__dls2
-}
-
-{
-   musl-dynlink-false-positive2
-   Memcheck:Leak
-   fun:calloc
-   fun:load_direct_deps
-   fun:load_deps
-   fun:load_deps
-   fun:__dls3
-   fun:__dls2
-}
-
-{
-   musl-dynlink-false-positive3
-   Memcheck:Leak
-   fun:calloc
-   fun:load_library
-   fun:load_preload
-   fun:__dls3
-   fun:__dls2b
-   fun:__dls2
-}
-
-{
-   musl-dynlink-false-positive4
-   Memcheck:Leak
-   fun:calloc
-   fun:load_library
-   fun:load_preload
-   fun:__dls3
-   fun:__dls2
-}

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

2023-01-29 Thread Sam James 
commit: 47e9795efeaedaf611cc959b1f8acaa51bb2f1f5
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 30 02:14:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 30 03:24:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e9795e

dev-util/valgrind: fix tests w/ gcc 13

Signed-off-by: Sam James  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 ..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 
+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 
+--- 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 
+ #include 
+ using namespace std;
+ 
+-- 
+2.31.1
+
+From 3155bacf26237beb65edb4a572402492b2f1b050 Mon Sep 17 00:00:00 2001
+From: Mark Wielaard 
+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 
++#endif
+ #include 
+ 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() {

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

2023-01-22 Thread Sam James 
commit: a87a1eec3f51d12790b03bc68c3d5690200ea0a3
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 23 01:09:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 23 01:09:46 2023 +
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  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-.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 ..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 
+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-.ebuild 
b/dev-util/valgrind/valgrind-.ebuild
index 82cd1992cc4f..b690f11f1222 100644
--- a/dev-util/valgrind/valgrind-.ebuild
+++ b/dev-util/valgrind/valgrind-.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

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

2023-01-22 Thread Sam James 
commit: 3bc35e7313ee1b5f20454cf7c920b071854752b2
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 23 01:10:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 23 01:10:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc35e73

dev-util/valgrind: drop misleading provenance comment in musl malloc patch

Per 
https://git.alpinelinux.org/aports/commit/main/valgrind?id=cd20c3c60433fd20b7e57723575a5944dc6ae42f,
this patch actually originated in Gentoo, so saying it's from Alpine is 
confusing.

Signed-off-by: Sam James  gentoo.org>

 dev-util/valgrind/files/valgrind-3.13.0-malloc.patch | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch 
b/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch
index ac6d90fef50f..d0eb795b84be 100644
--- a/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch
+++ b/dev-util/valgrind/files/valgrind-3.13.0-malloc.patch
@@ -1,5 +1,3 @@
-From: https://git.alpinelinux.org/aports/tree/main/valgrind/
-
 --- valgrind-3.13.0/coregrind/m_replacemalloc/vg_replace_malloc.c
 +++ valgrind-3.13.0/coregrind/m_replacemalloc/vg_replace_malloc.c
 @@ -765,13 +765,15 @@ static void init(void);

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

2022-11-22 Thread Sam James 
commit: 3b63bb5b479ef0c7e014d4125bc4cc5317cee14b
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov 22 20:10:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov 22 20:10:51 2022 +
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  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 ..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 
+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() {

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

2022-09-09 Thread Sam James 
commit: 80b1fc1e8b31f1e0b775cc2b856a64e7e058587f
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 10 01:57:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 10 01:57:18 2022 +
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  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-.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 ..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 
+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-.ebuild 
b/dev-util/valgrind/valgrind-.ebuild
index 7e7417e90831..aed73f6be21b 100644
--- a/dev-util/valgrind/valgrind-.ebuild
+++ b/dev-util/valgrind/valgrind-.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

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

2022-07-27 Thread Anthony G. Basile 
commit: ed72eb9c4dbc966a8ad1ad50bd3b0b21d2d2e0bc
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Jul 27 13:37:33 2022 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Jul 27 13:47:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed72eb9c

dev-util/valgrind: add missing musl.supp

Closes: https://bugs.gentoo.org/828687
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Anthony G. Basile  gentoo.org>

 dev-util/valgrind/files/musl.supp | 47 +++
 1 file changed, 47 insertions(+)

diff --git a/dev-util/valgrind/files/musl.supp 
b/dev-util/valgrind/files/musl.supp
new file mode 100644
index ..69adac7bb5da
--- /dev/null
+++ b/dev-util/valgrind/files/musl.supp
@@ -0,0 +1,47 @@
+# From: https://git.alpinelinux.org/aports/tree/main/valgrind/
+# Suppressions for musl libc
+# See: https://www.openwall.com/lists/musl/2017/06/15/4
+
+{
+   musl-dynlink-false-positive1
+   Memcheck:Leak
+   fun:calloc
+   fun:load_direct_deps
+   fun:load_deps
+   fun:load_deps
+   fun:__dls3
+   fun:__dls2b
+   fun:__dls2
+}
+
+{
+   musl-dynlink-false-positive2
+   Memcheck:Leak
+   fun:calloc
+   fun:load_direct_deps
+   fun:load_deps
+   fun:load_deps
+   fun:__dls3
+   fun:__dls2
+}
+
+{
+   musl-dynlink-false-positive3
+   Memcheck:Leak
+   fun:calloc
+   fun:load_library
+   fun:load_preload
+   fun:__dls3
+   fun:__dls2b
+   fun:__dls2
+}
+
+{
+   musl-dynlink-false-positive4
+   Memcheck:Leak
+   fun:calloc
+   fun:load_library
+   fun:load_preload
+   fun:__dls3
+   fun:__dls2
+}

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

2021-07-02 Thread Matt Turner 
commit: 0a4c5e8d86b6cef5b24b5a0cdea494f9857531a0
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jul  2 20:22:39 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jul  2 22:01:27 2021 +
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  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 000..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

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

2020-05-30 Thread Anthony G. Basile 
commit: abbbcef1980f446577f34a1f30c42f2fad90efa7
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat May 30 16:50:21 2020 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat May 30 23:31:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abbbcef1

dev-util/valgrind: remove unused patches

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Anthony G. Basile  gentoo.org>

 ...ept-read-only-PT_LOAD-segments-and-rodata.patch | 95 --
 ...further-mappings-after-read-all-debuginfo.patch | 70 
 .../files/valgrind-3.13.0-test-fixes.patch | 29 ---
 .../files/valgrind-3.13.0-xml-socket.patch | 27 --
 .../files/valgrind-3.7.0-fno-stack-protector.patch | 12 ---
 5 files changed, 233 deletions(-)

diff --git 
a/dev-util/valgrind/files/valgrind-3.13.0-accept-read-only-PT_LOAD-segments-and-rodata.patch
 
b/dev-util/valgrind/files/valgrind-3.13.0-accept-read-only-PT_LOAD-segments-and-rodata.patch
deleted file mode 100644
index 41f73b43f35..000
--- 
a/dev-util/valgrind/files/valgrind-3.13.0-accept-read-only-PT_LOAD-segments-and-rodata.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-See https://bugs.gentoo.org/664882
-
-From 64aa729bfae71561505a40c12755bd6b55bb3061 Mon Sep 17 00:00:00 2001
-From: Mark Wielaard 
-Date: Thu, 12 Jul 2018 13:56:00 +0200
-Subject: [PATCH] Accept read-only PT_LOAD segments and .rodata.
-
-The new binutils ld -z separate-code option creates multiple read-only
-PT_LOAD segments and might place .rodata in a non-executable segment.
-
-Allow and keep track of separate read-only segments and allow a readonly
-page with .rodata section.
-
-Based on patches from Tom Hughes  and
-H.J. Lu .
-
-https://bugs.kde.org/show_bug.cgi?id=395682

- coregrind/m_debuginfo/debuginfo.c |  2 --
- coregrind/m_debuginfo/readelf.c   | 34 +++
- 3 files changed, 27 insertions(+), 10 deletions(-)
-
 a/coregrind/m_debuginfo/debuginfo.c
-+++ b/coregrind/m_debuginfo/debuginfo.c
-@@ -957,9 +957,7 @@
- #error "Unknown platform"
- #  endif
- 
--#  if defined(VGP_x86_darwin) && DARWIN_VERS >= DARWIN_10_7
-is_ro_map = seg->hasR && !seg->hasW && !seg->hasX;
--#  endif
- 
- #  if defined(VGO_solaris)
-is_rx_map = seg->hasR && seg->hasX && !seg->hasW;
 a/coregrind/m_debuginfo/readelf.c
-+++ b/coregrind/m_debuginfo/readelf.c
-@@ -1785,7 +1785,7 @@
-Bool loaded = False;
-for (j = 0; j < VG_(sizeXA)(di->fsm.maps); j++) {
-   const DebugInfoMapping* map = VG_(indexXA)(di->fsm.maps, j);
--  if (   (map->rx || map->rw)
-+  if (   (map->rx || map->rw || map->ro)
-   && map->size > 0 /* stay sane */
-   && a_phdr.p_offset >= map->foff
-   && a_phdr.p_offset <  map->foff + map->size
-@@ -1816,6 +1816,16 @@
-i, (UWord)item.bias);
- loaded = True;
-  }
-+ if (map->ro
-+ && (a_phdr.p_flags & (PF_R | PF_W | PF_X))
-+== PF_R) {
-+item.exec = False;
-+VG_(addToXA)(svma_ranges, );
-+TRACE_SYMTAB(
-+   "PT_LOAD[%ld]:   acquired as ro, bias 0x%lx\n",
-+   i, (UWord)item.bias);
-+loaded = True;
-+ }
-   }
-}
-if (!loaded) {
-@@ -2083,17 +2093,25 @@
-  }
-   }
- 
--  /* Accept .rodata where mapped as rx (data), even if zero-sized */
-+  /* Accept .rodata where mapped as rx or rw (data), even if zero-sized */
-   if (0 == VG_(strcmp)(name, ".rodata")) {
-- if (inrx && !di->rodata_present) {
--di->rodata_present = True;
-+ if (!di->rodata_present) {
- di->rodata_svma = svma;
--di->rodata_avma = svma + inrx->bias;
-+di->rodata_avma = svma;
- di->rodata_size = size;
--di->rodata_bias = inrx->bias;
- di->rodata_debug_svma = svma;
--di->rodata_debug_bias = inrx->bias;
--/* NB was 'inrw' prior to r11794 */
-+if (inrx) {
-+   di->rodata_avma += inrx->bias;
-+   di->rodata_bias = inrx->bias;
-+   di->rodata_debug_bias = inrx->bias;
-+} else if (inrw) {
-+   di->rodata_avma += inrw->bias;
-+   di->rodata_bias = inrw->bias;
-+   di->rodata_debug_bias = inrw->bias;
-+} else {
-+   BAD(".rodata");
-+}
-+di->rodata_present = True;
- TRACE_SYMTAB("acquiring .rodata svma = %#lx .. %#lx\n",
-  di->rodata_svma,
-

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

2017-08-09 Thread Anthony G. Basile 
commit: d3cbd9d03ed37de94df83f45a4535ce3f7391542
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Aug  9 09:11:30 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Aug  9 12:18:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3cbd9d0

dev-util/valgrind: remove unused patches

 .../files/valgrind-3.10.1-glibc-2.21.patch |  17 ---
 .../files/valgrind-3.10.1-glibc-2.22.patch |  17 ---
 .../valgrind/files/valgrind-3.10.1-linux-4.patch   |  29 
 .../files/valgrind-3.10.1-non-exec-stack.patch | 148 
 .../files/valgrind-3.11.0-non-exec-stack.patch | 154 -
 .../files/valgrind-3.6.0-local-labels.patch|  24 
 .../valgrind/files/valgrind-3.9.0-glibc-2.19.patch |  37 -
 7 files changed, 426 deletions(-)

diff --git a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch 
b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch
deleted file mode 100644
index 286e431b0dd..000
--- a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.21.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur valgrind-3.10.1.orig/configure.ac valgrind-3.10.1/configure.ac
 valgrind-3.10.1.orig/configure.ac  2014-11-25 14:41:13.0 -0500
-+++ valgrind-3.10.1/configure.ac   2015-07-28 22:35:22.315604804 -0400
-@@ -1018,6 +1018,13 @@
-   DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-   DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-   ;;
-+ 2.21)
-+  AC_MSG_RESULT(2.21 family)
-+  AC_DEFINE([GLIBC_2_21], 1, [Define to 1 if you're using glibc 2.21.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/files/valgrind-3.10.1-glibc-2.22.patch 
b/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch
deleted file mode 100644
index aa44aec4a57..000
--- a/dev-util/valgrind/files/valgrind-3.10.1-glibc-2.22.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/files/valgrind-3.10.1-linux-4.patch 
b/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
deleted file mode 100644
index 63918c2c1d0..000
--- a/dev-util/valgrind/files/valgrind-3.10.1-linux-4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ecb3746d69820905c076b89e1be7042f52ceaa5f Mon Sep 17 00:00:00 2001
-From: Janne Grunau 
-Date: Thu, 19 Mar 2015 22:44:51 +0100
-Subject: [PATCH 1/1] configure: support linux 4.*
-
-There is nothing special in linux 4.0. Handle it as another 3.* (or
-another 2.6.*) release. Compare changeset 14955 in valgrind's
-subversion repository. Valgrind trunk also drops support for linux 2.4
-but there is no need to do that for realeased software.

- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0fd2a41..33c7954 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -303,7 +303,7 @@ case "${host_os}" in
- kernel=`uname -r`
- 
- case "${kernel}" in
-- 2.6.*|3.*) 
-+ 2.6.*|3.*|4.*)
-   AC_MSG_RESULT([2.6.x/3.x family (${kernel})])
-   AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using 
Linux 2.6.x or Linux 3.x])
-   ;;
--- 
-2.3.3
-

diff --git a/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch 
b/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch
deleted file mode 100644
index e25de99e790..000
--- a/dev-util/valgrind/files/valgrind-3.10.1-non-exec-stack.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff -Naur valgrind-3.10.1.orig/coregrind/Makefile.am 
valgrind-3.10.1/coregrind/Makefile.am
 valgrind-3.10.1.orig/coregrind/Makefile.am 2014-11-25 14:41:19.0 
-0500
-+++ valgrind-3.10.1/coregrind/Makefile.am  2014-11-26 13:36:44.113678744 
-0500
-@@ -333,18 +333,6 @@
-   m_demangle/demangle.c

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

2016-04-16 Thread Anthony G. Basile 
commit: e3c5a0e733406e2b0e32085edd01340d3de32486
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Apr 16 08:43:19 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Apr 16 08:59:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c5a0e7

dev-util/valgrind: remove older patches

Package-Manager: portage-2.2.26

 .../files/valgrind-3.10.0-non-exec-stack.patch | 148 -
 .../files/valgrind-3.7.0-automake-1.11.2.patch |  37 --
 .../files/valgrind-3.7.0-fix-gcc-regex.patch   |  35 -
 .../valgrind/files/valgrind-3.7.0-glibc-2.15.patch |  26 
 .../files/valgrind-3.7.0-non-exec-stack-v2.patch   | 143 
 .../files/valgrind-3.7.0-non-exec-stack.patch  | 138 ---
 .../files/valgrind-3.8.0-non-exec-stack.patch  | 142 
 .../files/valgrind-3.8.1-gcc-4.8-memmove.patch |  26 
 .../valgrind/files/valgrind-3.8.1-glibc-2.17.patch |  26 
 .../files/valgrind-3.9.0-non-exec-stack.patch  | 144 
 10 files changed, 865 deletions(-)

diff --git a/dev-util/valgrind/files/valgrind-3.10.0-non-exec-stack.patch 
b/dev-util/valgrind/files/valgrind-3.10.0-non-exec-stack.patch
deleted file mode 100644
index d4ae13d..000
--- a/dev-util/valgrind/files/valgrind-3.10.0-non-exec-stack.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff -Naur valgrind-3.10.0.orig/coregrind/Makefile.am 
valgrind-3.10.0/coregrind/Makefile.am
 valgrind-3.10.0.orig/coregrind/Makefile.am 2014-09-08 08:28:30.0 
-0400
-+++ valgrind-3.10.0/coregrind/Makefile.am  2014-09-12 20:54:25.720389938 
-0400
-@@ -333,18 +333,6 @@
-   m_demangle/demangle.c \
-   m_demangle/dyn-string.c \
-   m_demangle/safe-ctype.c \
--  m_dispatch/dispatch-x86-linux.S \
--  m_dispatch/dispatch-amd64-linux.S \
--  m_dispatch/dispatch-ppc32-linux.S \
--  m_dispatch/dispatch-ppc64be-linux.S \
--  m_dispatch/dispatch-ppc64le-linux.S \
--  m_dispatch/dispatch-arm-linux.S \
--  m_dispatch/dispatch-arm64-linux.S \
--  m_dispatch/dispatch-s390x-linux.S \
--  m_dispatch/dispatch-mips32-linux.S \
--  m_dispatch/dispatch-mips64-linux.S \
--  m_dispatch/dispatch-x86-darwin.S \
--  m_dispatch/dispatch-amd64-darwin.S \
-   m_gdbserver/inferiors.c \
-   m_gdbserver/m_gdbserver.c \
-   m_gdbserver/regcache.c \
-@@ -368,8 +356,6 @@
-   m_initimg/initimg-pathscan.c \
-   m_mach/mach_basics.c \
-   m_mach/mach_msg.c \
--  m_mach/mach_traps-x86-darwin.S \
--  m_mach/mach_traps-amd64-darwin.S \
-   m_replacemalloc/replacemalloc_core.c \
-   m_scheduler/scheduler.c \
-   m_scheduler/sema.c \
-@@ -386,18 +372,6 @@
-   m_sigframe/sigframe-mips64-linux.c \
-   m_sigframe/sigframe-x86-darwin.c \
-   m_sigframe/sigframe-amd64-darwin.c \
--  m_syswrap/syscall-x86-linux.S \
--  m_syswrap/syscall-amd64-linux.S \
--  m_syswrap/syscall-ppc32-linux.S \
--  m_syswrap/syscall-ppc64be-linux.S \
--  m_syswrap/syscall-ppc64le-linux.S \
--  m_syswrap/syscall-arm-linux.S \
--  m_syswrap/syscall-arm64-linux.S \
--  m_syswrap/syscall-s390x-linux.S \
--  m_syswrap/syscall-mips32-linux.S \
--  m_syswrap/syscall-mips64-linux.S \
--  m_syswrap/syscall-x86-darwin.S \
--  m_syswrap/syscall-amd64-darwin.S \
-   m_syswrap/syswrap-main.c \
-   m_syswrap/syswrap-generic.c \
-   m_syswrap/syswrap-linux.c \
-@@ -420,6 +394,29 @@
-   m_ume/main.c \
-   m_ume/script.c
- 
-+COREGRIND_SOURCES_COMMON += \
-+  m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S \
-+  m_syswrap/syscall-@VGCONF_ARCH_PRI@-@VGCONF_OS@.S
-+
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+  m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S \
-+  m_syswrap/syscall-@VGCONF_ARCH_SEC@-@VGCONF_OS@.S
-+endif
-+
-+if VGCONF_OS_IS_DARWIN
-+COREGRIND_SOURCES_COMMON += \
-+  m_dispatch/dispatch-@VGCONF_ARCH_PRI@-darwin.S \
-+  m_syswrap/syscall-@VGCONF_ARCH_PRI@-darwin.S \
-+  m_mach/mach_traps-@VGCONF_ARCH_PRI@-darwin.S
-+if VGCONF_HAVE_PLATFORM_SEC
-+COREGRIND_SOURCES_COMMON += \
-+  m_dispatch/dispatch-@VGCONF_ARCH_SEC@-darwin.S \
-+  m_syswrap/syscall-@VGCONF_ARCH_SEC@-darwin.S \
-+  m_mach/mach_traps-@VGCONF_ARCH_SEC@-darwin.S
-+endif
-+endif
-+
- libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
- $(COREGRIND_SOURCES_COMMON)
- nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
-diff -Naur valgrind-3.10.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S 
valgrind-3.10.0/coregrind/m_dispatch/dispatch-amd64-linux.S
 valgrind-3.10.0.orig/coregrind/m_dispatch/dispatch-amd64-linux.S   
2014-09-08 08:28:46.0 -0400
-+++ valgrind-3.10.0/coregrind/m_dispatch/dispatch-amd64-linux.S
2014-09-12 20:49:14.681385751 -0400
-@@ -249,11 +249,11 @@
- 
- .size VG_(disp_run_translations),

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

2016-04-16 Thread Anthony G. Basile 
commit: 3a0c640086917cd6ce03f9ce6e16003ad612dd4b
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Apr 16 08:58:51 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Apr 16 08:59:13 2016 +
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 000..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