Added valgrind-3.5.0 (bug #282607) and undid stabilization of valgrind-3.4.1 for ppc64 (bug #278534).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 127 insertions, 3 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index a5a3f30ecf61..3bed503f58ae 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,16 @@
 # 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.105 2009/08/31 18:09:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.106 2009/10/14 18:50:59 griffon26 Exp $
+
+*valgrind-3.5.0 (14 Oct 2009)
+
+  14 Oct 2009; Maurice van der Pot <griffon26@gentoo.org>
+  valgrind-3.4.1.ebuild, +valgrind-3.5.0.ebuild,
+  +files/valgrind-3.5.0-respect-LDFLAGS.patch:
+  Undid stabilization of valgrind-3.4.1 for ppc64. It was stabilized despite
+  Joe Jezak's comment that it shouldn't be (bug #278534 comment 3) and Joe
+  agreed it should be undone.
+  Added valgrind-3.5.0 as requested in bug #282607.
 
   31 Aug 2009; Brent Baude <ranger@gentoo.org> valgrind-3.4.1.ebuild:
   Marking valgrind-3.4.1 ppc64 for bug 278534
diff --git a/dev-util/valgrind/files/valgrind-3.5.0-respect-LDFLAGS.patch b/dev-util/valgrind/files/valgrind-3.5.0-respect-LDFLAGS.patch
new file mode 100644
index 000000000000..3b77403df3ac
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.5.0-respect-LDFLAGS.patch
@@ -0,0 +1,14 @@
+diff -ruN valgrind-3.5.0/mpi/Makefile.am valgrind-3.5.0-fixed/mpi/Makefile.am
+--- valgrind-3.5.0/mpi/Makefile.am	2009-08-19 15:36:29.000000000 +0200
++++ valgrind-3.5.0-fixed/mpi/Makefile.am	2009-10-05 20:17:59.000000000 +0200
+@@ -8,8 +8,8 @@
+ DEFS =
+ DEFAULT_INCLUDES =
+ CPPFLAGS =
+-CFLAGS =
+-LDFLAGS =
++#CFLAGS =
++#LDFLAGS =
+ 
+ EXTRA_DIST = \
+ 	libmpiwrap_aix5.exp \
diff --git a/dev-util/valgrind/valgrind-3.4.1.ebuild b/dev-util/valgrind/valgrind-3.4.1.ebuild
index 4dede260b017..ea5f21d25b85 100644
--- a/dev-util/valgrind/valgrind-3.4.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.4.1.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.ebuild,v 1.5 2009/08/31 18:09:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.4.1.ebuild,v 1.6 2009/10/14 18:50:59 griffon26 Exp $
 
 inherit autotools eutils flag-o-matic toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 ppc ppc64 x86"
+KEYWORDS="-* amd64 ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="!dev-util/callgrind"
diff --git a/dev-util/valgrind/valgrind-3.5.0.ebuild b/dev-util/valgrind/valgrind-3.5.0.ebuild
new file mode 100644
index 000000000000..492db72cf660
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.5.0.ebuild
@@ -0,0 +1,100 @@
+# 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.5.0.ebuild,v 1.1 2009/10/14 18:50:59 griffon26 Exp $
+
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}
+	!dev-util/callgrind"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# make sure our CFLAGS are respected
+	einfo "Changing configure.in to respect CFLAGS"
+	sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
+
+	# undefined references to __guard and __stack_smash_handler in VEX (bug #114347)
+	einfo "Changing Makefile.all.am to disable SSP"
+	sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' Makefile.all.am
+
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${P}:" docs/Makefile.am
+
+	# Remove defaulting to ppc32-linux on ppc64 without multilib
+	# "valgrind: failed to start tool 'memcheck' for platform 'ppc32-linux':
+	#  No such file or directory"
+	if use ppc64 && ! has_multilib_profile; then
+		epatch "${FILESDIR}/valgrind-3.3.0-only64bit.patch"
+	fi
+
+	# Fix up some suppressions that were not general enough for glibc versions
+	# 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.5.0-respect-LDFLAGS.patch"
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fpie                 valgrind seemingly hangs when built with pie on
+	#                       amd64 (bug #102157)
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fpie
+	filter-flags -fstack-protector
+	replace-flags -ggdb3 -ggdb2
+
+	# gcc 3.3.x fails to compile valgrind with -O3 (bug #129776)
+	if [ "$(gcc-version)" == "3.3" ] && is-flagq -O3; then
+		ewarn "GCC 3.3 cannot compile valgrind with -O3 in CFLAGS, using -O2 instead."
+		replace-flags -O3 -O2
+	fi
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+	fi
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf="${myconf} --without-mpicc"
+	fi
+
+	econf ${myconf} || die "Configure failed!"
+	emake || die "Make failed!"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed!"
+	dodoc AUTHORS FAQ.txt NEWS README*
+}
+
+pkg_postinst() {
+	if use ppc || use ppc64 || use amd64 ; then
+		ewarn "Valgrind will not work on ppc, ppc64 or amd64 if glibc does not have"
+		ewarn "debug symbols (see https://bugs.gentoo.org/show_bug.cgi?id=214065"
+		ewarn "and http://bugs.gentoo.org/show_bug.cgi?id=274771)."
+		ewarn "To fix this you can add splitdebug to FEATURES in make.conf and"
+		ewarn "remerge glibc."
+	fi
+}