Filter -m64 and -mx32 for the new multilib-portage, bug #398825

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 105 insertions, 5 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 6269312e0b00..a76a389d7e95 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.134 2012/01/14 23:25:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.135 2012/02/14 01:19:47 blueness Exp $
+
+*valgrind-3.7.0-r3 (14 Feb 2012)
+
+  14 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  +valgrind-3.7.0-r3.ebuild:
+  Filter -m64 and -mx32 for the new multilib-portage, bug #398825
 
   14 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
   valgrind-3.7.0-r2.ebuild, +files/valgrind-3.7.0-glibc-2.15.patch:
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index ffab6d55cf51..0e496bdc0e3f 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -48,12 +48,13 @@ EBUILD valgrind-3.6.1-r2.ebuild 3274 RMD160 73bb4329831338e42ed89da3bce708734200
 EBUILD valgrind-3.6.1.ebuild 3068 RMD160 5ae01b6484705ad9c7e7bf7e888a355054e6e4c2 SHA1 bcf3c5107a61fbfabbee441d3a304a9ffad8f672 SHA256 93eea5c2c81b7b92ba250706bec21d21575a88c5d426b37096409772119f4e0f
 EBUILD valgrind-3.7.0-r1.ebuild 2720 RMD160 4d4a707fac4c62a68d3de02ac44e23b8f641a4e1 SHA1 6283fed760b8fcd3391639e0cc8d92d398b110f6 SHA256 93b9f2dc0f5b24f17b4ae070740641b03de1d02b38f9a1bc808e660d31deea94
 EBUILD valgrind-3.7.0-r2.ebuild 2914 RMD160 2fa503bf96bde0acb40127f7e2dba33a8def975c SHA1 7ce04c6b5eb8005a0f07ec5724b38cbfb0796a9c SHA256 a5b9a5af3dabe5c16f63a29861a518a1d76bea403072ec5dae3d539f2ecd338d
-MISC ChangeLog 22463 RMD160 df938403a4b70faf089177ca85f2da9f8401c1b8 SHA1 f7a3a1dc2a87b2223ee30cacf37df1262a26aee5 SHA256 da9ed761e8467b5acdf25487dba9d34b70454111dfb86478926293fe3109d0d1
+EBUILD valgrind-3.7.0-r3.ebuild 2953 RMD160 ecc6aad147d1d45ce2448978972bad491a0f2235 SHA1 444759afbfe632bd13bf256e0a51ca63635e708b SHA256 315d940ccc86dbbe845a03c6415863cc7e1813814a90a7f64dafccf9bec54bd8
+MISC ChangeLog 22648 RMD160 e7956d3ce5ab79e88e2815990215512fc95df78b SHA1 7717275426543ad66d61d0c86dd3a72221687fa2 SHA256 fb746ebd986bdd91f178a7c172d631a6518342fe12c392e6a062daa762dd3e1c
 MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk8SDuYACgkQl5yvQNBFVTVZGQCaAwMP+TnHn5+fPYCsBy+6QCoH
-IRsAnjrb3ubKvKHQHQDPLERIyjqLlFLd
-=bOi5
+iEYEAREIAAYFAk85tr4ACgkQl5yvQNBFVTVvJwCggD4i+VAskocGup4unJ9JwEr0
+cZwAn1NM6CRRd5rvimwhLfD+sUVtbguO
+=tfNP
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/valgrind-3.7.0-r3.ebuild b/dev-util/valgrind/valgrind-3.7.0-r3.ebuild
new file mode 100644
index 000000000000..4b5fcec0d95b
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.7.0-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r3.ebuild,v 1.1 2012/02/14 01:19:47 blueness Exp $
+
+EAPI=4
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+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 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mpi"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	# Changing Makefile.all.am to disable SSP
+	epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
+
+	# Yet more local labels, this time for ppc32 & ppc64
+	epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.patch
+
+	# Don't build in empty assembly files for other platforms or we'll get a QA
+	# warning about executable stacks.
+	epatch "${FILESDIR}"/${PN}-3.7.0-non-exec-stack.patch
+
+	# Fix the regex to get gcc's version
+	epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch
+
+	# Fix stricter use of dir variables, bug #397429
+	epatch "${FILESDIR}"/${PN}-3.7.0-automake-1.11.2.patch
+
+	# Fix for glibc 2.15, bug #398921
+	epatch "${FILESDIR}"/${PN}-3.7.0-glibc-2.15.patch
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	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
+	filter-flags -m64
+	filter-flags -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	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}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS FAQ.txt NEWS README*
+
+	pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
+}
+
+pkg_postinst() {
+	ewarn "Valgrind will not work if glibc does not have debug symbols."
+	ewarn "To fix this you can add splitdebug to FEATURES in make.conf"
+	ewarn "and remerge glibc.  See:"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	ewarn "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}