Fixed valgrind bugs #260802 and #279194

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 50 insertions, 2 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 7fb45cdf271a..008e3b5d2a52 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.103 2009/07/26 12:05:52 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.104 2009/08/08 18:20:17 griffon26 Exp $
+
+  08 Aug 2009; Maurice van der Pot <griffon26@gentoo.org>
+  valgrind-3.4.1-r1.ebuild, +files/valgrind-3.4.1-local-labels.patch,
+  +files/valgrind-3.4.1-respect-LDFLAGS.patch:
+  Added patches to fix ignoring of LDFLAGS (bug #279194 by Arfrever Frehtes
+  Taifersar Arahesis <arfrever@gentoo.org>) and compilation error with GCC 4.4
+  and -O3 (bug #260802 by Ryan Hill <dirtyepic@gentoo.org>).
 
 *valgrind-3.4.1-r1 (26 Jul 2009)
 
diff --git a/dev-util/valgrind/files/valgrind-3.4.1-local-labels.patch b/dev-util/valgrind/files/valgrind-3.4.1-local-labels.patch
new file mode 100644
index 000000000000..0d92d699646c
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.4.1-local-labels.patch
@@ -0,0 +1,15 @@
+Index: coregrind/m_libcassert.c
+===================================================================
+--- coregrind/m_libcassert.c	(revision 9538)
++++ coregrind/m_libcassert.c	(revision 9539)
+@@ -47,8 +47,8 @@
+ 
+ #if defined(VGP_x86_linux)
+ #  define GET_REAL_PC_SP_AND_FP(pc, sp, fp)      \
+-      asm("call m_libcassert_get_ip;" \
+-          "m_libcassert_get_ip: popl %0;" \
++      asm("call 0f;" \
++          "0: popl %0;" \
+           "movl %%esp, %1;" \
+           "movl %%ebp, %2;" \
+           : "=r" (pc),\
diff --git a/dev-util/valgrind/files/valgrind-3.4.1-respect-LDFLAGS.patch b/dev-util/valgrind/files/valgrind-3.4.1-respect-LDFLAGS.patch
new file mode 100644
index 000000000000..37ff26cb4511
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.4.1-respect-LDFLAGS.patch
@@ -0,0 +1,20 @@
+diff -ruN valgrind-3.4.1/auxprogs/Makefile.am valgrind-3.4.1-fixed/auxprogs/Makefile.am
+--- valgrind-3.4.1/auxprogs/Makefile.am	2009-03-01 22:55:53.000000000 +0100
++++ valgrind-3.4.1-fixed/auxprogs/Makefile.am	2009-08-08 19:56:32.000000000 +0200
+@@ -64,14 +64,14 @@
+ if BUILD_MPIWRAP_PRI
+ noinst_PROGRAMS       += libmpiwrap-@VG_PLATFORM_PRI@.so
+ libmpiwrap-@VG_PLATFORM_PRI@.so: libmpiwrap.c
+-	$(MPI_CC) $(HACKY_FLAGS_PRI) \
++	$(MPI_CC) $(HACKY_FLAGS_PRI) $(LDFLAGS) \
+ 		-I../include \
+ 		-o libmpiwrap-@VG_PLATFORM_PRI@.so libmpiwrap.c
+ endif
+ if BUILD_MPIWRAP_SEC
+ noinst_PROGRAMS       += libmpiwrap-@VG_PLATFORM_SEC@.so
+ libmpiwrap-@VG_PLATFORM_SEC@.so: libmpiwrap.c
+-	$(MPI_CC) $(HACKY_FLAGS_SEC) \
++	$(MPI_CC) $(HACKY_FLAGS_SEC) $(LDFLAGS) \
+ 		-I../include \
+ 		-o libmpiwrap-@VG_PLATFORM_SEC@.so libmpiwrap.c
+ endif
diff --git a/dev-util/valgrind/valgrind-3.4.1-r1.ebuild b/dev-util/valgrind/valgrind-3.4.1-r1.ebuild
index 22ff84915236..57d7e5c37121 100644
--- a/dev-util/valgrind/valgrind-3.4.1-r1.ebuild
+++ b/dev-util/valgrind/valgrind-3.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.4.1-r1.ebuild,v 1.1 2009/07/26 12:05:52 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.4.1-r1.ebuild,v 1.2 2009/08/08 18:20:17 griffon26 Exp $
 
 inherit autotools eutils flag-o-matic toolchain-funcs
 
@@ -43,6 +43,9 @@ src_unpack() {
 	# when optimisation is on (bug #234644).
 	epatch "${FILESDIR}/valgrind-3.3.1-local-labels.patch"
 
+	# More local labels (bug #260802, upstream revision 9539)
+	epatch "${FILESDIR}/valgrind-3.4.1-local-labels.patch"
+
 	# valgrind spits out many false positives on amd64 because of glibc-2.10's
 	# optimized strlen if there is no debug info for glibc (bug #274771). This
 	# patch adds a run-time error if debug info cannot be found.
@@ -52,6 +55,9 @@ src_unpack() {
 	# with more than just a major and minor number.
 	epatch "${FILESDIR}/valgrind-3.4.1-glibc-2.10.1.patch"
 
+	# Respect LDFLAGS also for libmpiwrap.so (bug #279194)
+	epatch "${FILESDIR}/valgrind-3.4.1-respect-LDFLAGS.patch"
+
 	# Regenerate autotools files
 	eautoreconf
 }