Added valgrind-3.2.1, fixed bug #147904 and added ~ppc64.

(Portage version: 2.1.2_pre1)

5 files changed, 131 insertions, 1 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 0e0dc5635e8a..bff5b759f5ad 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.65 2006/08/25 21:13:04 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.66 2006/09/17 16:49:18 griffon26 Exp $
+
+*valgrind-3.2.1 (17 Sep 2006)
+
+  17 Sep 2006; Maurice van der Pot <griffon26@gentoo.org>
+  +files/valgrind-3.2.1-only64bit.patch,
+  +files/valgrind-3.2.1-pkg-config.patch, +valgrind-3.2.1.ebuild:
+  Bumped version and added patch to correct pkg-config output, fixing 
+  bug #147904 reported by Priit Laes <amd@store20.com>. 
+  This is also the first valgrind ebuild marked ~ppc64.
 
   25 Aug 2006; <blubb@gentoo.org> valgrind-3.2.0.ebuild:
   stable on amd64
diff --git a/dev-util/valgrind/files/digest-valgrind-3.2.1 b/dev-util/valgrind/files/digest-valgrind-3.2.1
new file mode 100644
index 000000000000..b657d4583de1
--- /dev/null
+++ b/dev-util/valgrind/files/digest-valgrind-3.2.1
@@ -0,0 +1,3 @@
+MD5 9407d33961186814cef0e6ecedfd6318 valgrind-3.2.1.tar.bz2 4052885
+RMD160 eecd339f962b1657c377569650d435795638cc86 valgrind-3.2.1.tar.bz2 4052885
+SHA256 7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33 valgrind-3.2.1.tar.bz2 4052885
diff --git a/dev-util/valgrind/files/valgrind-3.2.1-only64bit.patch b/dev-util/valgrind/files/valgrind-3.2.1-only64bit.patch
new file mode 100644
index 000000000000..e3610eca3928
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.2.1-only64bit.patch
@@ -0,0 +1,12 @@
+diff -ruN valgrind-3.2.1/coregrind/launcher.c valgrind-3.2.1-patched/coregrind/launcher.c
+--- valgrind-3.2.1/coregrind/launcher.c	2006-08-28 15:39:04.000000000 +0200
++++ valgrind-3.2.1-patched/coregrind/launcher.c	2006-09-17 18:22:41.458977000 +0200
+@@ -244,7 +244,7 @@
+    else if (0==strcmp(VG_PLATFORM,"ppc32-linux"))
+       default_platform = "ppc32-linux";
+    else if (0==strcmp(VG_PLATFORM,"ppc64-linux"))
+-      default_platform = "ppc32-linux";
++      default_platform = "ppc64-linux";
+    else
+       barf("Unknown VG_PLATFORM '%s'", VG_PLATFORM);
+ 
diff --git a/dev-util/valgrind/files/valgrind-3.2.1-pkg-config.patch b/dev-util/valgrind/files/valgrind-3.2.1-pkg-config.patch
new file mode 100644
index 000000000000..25fb8a8fd915
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.2.1-pkg-config.patch
@@ -0,0 +1,20 @@
+Index: valgrind.pc.in
+===================================================================
+--- valgrind.pc.in	(revision 6077)
++++ valgrind.pc.in	(working copy)
+@@ -4,13 +4,13 @@
+ includedir=@includedir@/valgrind
+ arch=@VG_ARCH@
+ os=@VG_OS@
+-platform=@VG_PLATFORM@
++platform=@VG_ARCH@-@VG_OS@
+ valt_load_address=@VALT_LOAD_ADDRESS@
+ 
+ Name: Valgrind
+ Description: A dynamic binary instrumentation framework
+ Version: @VERSION@
+ Requires:
+-Libs: -L${libdir}/valgrind/@VG_PLATFORM@ -lcoregrind -lvex -lgcc
++Libs: -L${libdir}/valgrind/@VG_ARCH@-@VG_OS@ -lcoregrind -lvex -lgcc
+ Cflags: -I${includedir}
+ 
diff --git a/dev-util/valgrind/valgrind-3.2.1.ebuild b/dev-util/valgrind/valgrind-3.2.1.ebuild
new file mode 100644
index 000000000000..99fd81ea1c27
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.2.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.2.1.ebuild,v 1.1 2006/09/17 16:49:18 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="X"
+
+# bug #49147 (bogus stacktrace in gdb with --db-attach=yes) does not seem to be applicable anymore
+#RESTRICT="strip"
+
+RDEPEND="!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.flags.am to disable SSP"
+	sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' Makefile.flags.am
+
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${P}:" docs/Makefile.am
+
+	# Fix undefined reference to @VG_PLATFORM@ (bug #147904)
+	epatch "${FILESDIR}/${P}-pkg-config.patch"
+
+	# 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}/${P}-only64bit.patch"
+	fi
+
+	# 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
+
+	# Optionally build in X suppression files
+	use X && myconf="--with-x" || myconf="--with-x=no"
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+	fi
+
+	econf ${myconf} || die "Configure failed!"
+	emake || die "Make failed!"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed!"
+	dodoc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README*
+}
+