Patch to allow valgrind to build against glibc-2.14, bug #378157

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

4 files changed, 142 insertions, 5 deletions

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index 3c2cdf9a1679..9747f3491eba 100644
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/valgrind
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.124 2011/06/09 20:38:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.125 2011/08/09 13:30:13 blueness Exp $
+
+*valgrind-3.6.1-r2 (09 Aug 2011)
+
+  09 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
+  +valgrind-3.6.1-r2.ebuild, +files/valgrind-3.6.1-glibc-2.14.patch:
+  Added patch to allow valgrind to build against glibc-2.14, bug #378157
 
 *valgrind-3.6.1-r1 (09 Jun 2011)
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index bd942ebd2239..6d6ae69a33ff 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -19,6 +19,7 @@ AUX valgrind-3.6.0-glibc-2.13.patch 1761 RMD160 744d6a884896d8aaf8f06808a2a75f0b
 AUX valgrind-3.6.0-local-labels.patch 1388 RMD160 e9c0064d1e857f1e616c5d9ca7a03e78eae3d5ab SHA1 173820d5671f56c864850c2d8df9d6d301dfda38 SHA256 34ae13eda378677f1e662e0813f138de9b897d6592d20872c58ed8ac1bcf7def
 AUX valgrind-3.6.0-non-exec-stack.patch 5613 RMD160 641cd94fd5254ea902bd66eb0437e9af0e21fdb4 SHA1 eeb788f208303ef8768d4713c2c01bfd3f2edec4 SHA256 9a5a92506a10af32eba7a28401f061d4a84eac26a4dbb94fc6a19471c4bdb257
 AUX valgrind-3.6.0-strcasecmp.patch 3786 RMD160 7887dd9e2dc9e5934a25106c6413458bbe5203e3 SHA1 4eec14e0c7beb671050d4c91986cc878cdb5494f SHA256 e281b93d1f2e0166fbba6ebd061a8fd7a01edd31b56cf23f1f84617385add0f6
+AUX valgrind-3.6.1-glibc-2.14.patch 1078 RMD160 d0a853f9d65e821e3586fd3058db37bb2139e251 SHA1 98b0ea183b90ddf5aee4f68f31f6bf5e818ba4ac SHA256 c76f3f965ebd98d469e6431780267dfb7ad1a58da0ab397ebfc21a08e98828a5
 AUX valgrind-3.6.1-linux-3.patch 392 RMD160 1b654f96b339c15e1e89d41d8dfa01fc5be3cd60 SHA1 c191a54cf24952e103ee1a882fce4c50c119c81d SHA256 056b6fc872ed0be91a2000e599a9431e1bc78efa7ee2ac986f74f2e450f28582
 AUX valgrind-3.6.1-user-enable-qt4.patch 3100 RMD160 d5130569c986714dbd39af5354a1f5c9a039d019 SHA1 6252b9220f8ec6b3e336802101eb296b53209c97 SHA256 ffe139eabb1340a6f004e4a9858d36cf19616bb1c4156395ea2b3b6600a23217
 DIST valgrind-3.3.1.tar.bz2 4544805 RMD160 32fb26de2ffd0d62e66a1f29cfa6785b7ffa8c36 SHA1 3a64ee5f6439815fa6c5200dcfd0399f9dc83348 SHA256 95b7b4d815bd479332637c93e69ec24167cd28d4f9d9f9b718e1b091bb88aafa
@@ -36,13 +37,14 @@ EBUILD valgrind-3.5.0-r1.ebuild 3730 RMD160 b485ad3121c741099c5fb3711f52194ebdf4
 EBUILD valgrind-3.5.0.ebuild 3648 RMD160 d3569e0802939fd698787e234db83f17847e2b03 SHA1 af5bbe18d9ca1cb6be77c495de1fb5429c81aa17 SHA256 9092956486a250b85479e3723138848e6192239e79aca06637dfa0811f21487d
 EBUILD valgrind-3.6.0.ebuild 3040 RMD160 ed2e6ba1c77077c4c171c5b0fb651779c97ca8b2 SHA1 8a8560a12cd63456a2070d86a5375612b19a2ab7 SHA256 bf92aa0977ea7d3978dae720e85fa7643b89d4ebd7c39ade3a36c4d20ba47fea
 EBUILD valgrind-3.6.1-r1.ebuild 3182 RMD160 807ce12a59b3d35258d67dec22794791abb1c755 SHA1 ecba41084ddc19794df132a50e8a76074406c07a SHA256 b1ab29f160c9e63c0dfb2147c7b4c84c8bfabe940ace218fbd7743bc4f2ba9d9
+EBUILD valgrind-3.6.1-r2.ebuild 3293 RMD160 bd880028a2755930931b5c8d773e09a0d8479aeb SHA1 b5aabaae0f5a3e58ab6498cecabc08d5d45481ec SHA256 dea319397cc4eac1be0ec8d68503f41cd318a7699159414b247e1c2921b0e194
 EBUILD valgrind-3.6.1.ebuild 3068 RMD160 5ae01b6484705ad9c7e7bf7e888a355054e6e4c2 SHA1 bcf3c5107a61fbfabbee441d3a304a9ffad8f672 SHA256 93eea5c2c81b7b92ba250706bec21d21575a88c5d426b37096409772119f4e0f
-MISC ChangeLog 20607 RMD160 ec09471bb1667a25cd5a2e27e27ddf657dec8b7a SHA1 de0adf954611b86429d266fc39337c25eb7446ba SHA256 0bc42717dc0d2e8f64d533261b6cb45d242908399ff9ca010f8d4eeacda2bdbf
+MISC ChangeLog 20839 RMD160 c4a71d89207781e334b704c3b6245f6bc792b875 SHA1 888b20895c68509d00ebafb9aeec3f11e09034c7 SHA256 63b9cb711541852ed114322b2f2ffd71438b67f19968d45a6199be18883b7685
 MISC metadata.xml 1002 RMD160 cac070ef7b7c44166aa21cda6063c597f66d0303 SHA1 adb9b3de0413a58f79b522f06f542854c3aaaca0 SHA256 ad67a48bab8386d59f5481471eb6a474e68a08a7f1d8f8c7a41b1134ac464f68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEUEAREIAAYFAk3xL08ACgkQl5yvQNBFVTXh3ACY1BetPS2BWcUbXiDnq4IX04zl
-NgCfUIrqX1By1TlWanhGIs1oLHvS3og=
-=II3L
+iEYEAREIAAYFAk5BNnAACgkQl5yvQNBFVTXauwCeMKodk0OvUe/+jdDtyvj8u6hH
+KJ8An2gnsz1unq3j1byCjHgmYJTv55y2
+=3Jha
 -----END PGP SIGNATURE-----
diff --git a/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.14.patch b/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.14.patch
new file mode 100644
index 000000000000..446efac118ce
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.6.1-glibc-2.14.patch
@@ -0,0 +1,26 @@
+diff -Naur valgrind-3.6.1.orig/configure.in valgrind-3.6.1/configure.in
+--- valgrind-3.6.1.orig/configure.in	2011-08-09 09:06:50.000000000 -0400
++++ valgrind-3.6.1/configure.in	2011-08-09 09:21:42.000000000 -0400
+@@ -756,6 +756,13 @@
+ 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
+ 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
+ 	;;
++     2.14)
++	AC_MSG_RESULT(2.14 family)
++	AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.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}"
++	;;
+      aix5)
+ 	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
+ 	AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
+@@ -769,7 +776,7 @@
+ 
+      *)
+ 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+-	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13])
++	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14])
+ 	AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
+ 	AC_MSG_ERROR([or Darwin libc])
+ 	;;
diff --git a/dev-util/valgrind/valgrind-3.6.1-r2.ebuild b/dev-util/valgrind/valgrind-3.6.1-r2.ebuild
new file mode 100644
index 000000000000..81eb625498f6
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.6.1-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1-r2.ebuild,v 1.1 2011/08/09 13:30:13 blueness Exp $
+
+EAPI=2
+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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mpi qt4"
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Respect CFLAGS, LDFLAGS
+	sed -i -e '/^CPPFLAGS =/d' -e '/^CFLAGS =/d' -e '/^LDFLAGS =/d' \
+		mpi/Makefile.am || die
+
+	# Changing Makefile.all.am to disable SSP
+	sed -i -e 's:^AM_CFLAGS_BASE = :AM_CFLAGS_BASE = -fno-stack-protector :' \
+		Makefile.all.am || die
+
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" \
+		docs/Makefile.am || die
+
+	# 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.6.0-non-exec-stack.patch
+
+	# Fix up some suppressions that were not general enough for glibc versions
+	# with more than just a major and minor number.
+	epatch "${FILESDIR}"/${PN}-3.4.1-glibc-2.10.1.patch
+
+	# Remove automagic dependency on qt4
+	epatch "${FILESDIR}"/${PN}-3.6.1-user-enable-qt4.patch
+
+	# Allow valgrind to build against linux-3, bug #370857
+	epatch "${FILESDIR}"/${PN}-3.6.1-linux-3.patch
+
+	# Allow valgrind to build against glibc-2.14, bug #378157
+	epatch "${FILESDIR}"/${PN}-3.6.1-glibc-2.14.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
+	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
+
+	if ! use qt4; then
+		myconf="${myconf} --disable-qtcore"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS FAQ.txt NEWS README*
+
+	pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
+}
+
+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
+}