[patch] patch against valgrind-3.5.0-r1.ebuild

valgrind-3.6.0.ebuild.patch (text/plain), 3.70 KB, created by Anthony Basile on 2010-11-03 22:14:08 UTC

--- /usr/portage/dev-util/valgrind/valgrind-3.5.0-r1.ebuild	2010-10-28 13:39:53.000000000 -0400
+++ valgrind-3.6.0.ebuild	2010-11-02 16:48:59.000000000 -0400
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.5.0-r1.ebuild,v 1.1 2010/10/28 17:39:53 blueness Exp $
 
+EAPI=2
 inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
 
 DESCRIPTION="An open-source memory debugger for GNU/Linux"
@@ -10,54 +11,42 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~arm ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 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
+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/${P}:" docs/Makefile.am
-
-	# 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"
+	sed -i -e "s:doc/valgrind:doc/${PF}:" \
+		docs/Makefile.am || die
 
 	# Yet more local labels, this time for ppc32 & ppc64
-	epatch "${FILESDIR}/valgrind-3.5.0-local-labels.patch"
-
-	# Don't just reject glibc-2.11
-	epatch "${FILESDIR}/valgrind-3.5.0-glibc-2.11.patch"
+	epatch "${FILESDIR}/valgrind-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}/valgrind-3.5.0-non-exec-stack.patch"
+	epatch "${FILESDIR}/valgrind-3.6.0-non-exec-stack.patch"
 
-	# Minimal fixes required for glibc-2.12
-	epatch "${FILESDIR}/valgrind-3.5.0-glibc-2.12.patch"
-	epatch "${FILESDIR}/valgrind-3.5.0-stat_h.patch"
+	# 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"
 
 	# Regenerate autotools files
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
@@ -72,12 +61,6 @@
 	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
@@ -87,12 +70,11 @@
 		myconf="${myconf} --without-mpicc"
 	fi
 
-	econf ${myconf} || die "Configure failed!"
-	emake || die "Make failed!"
+	econf ${myconf}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed!"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS FAQ.txt NEWS README*
 
 	pax-mark m "${D}"/usr/$(get_libdir)/valgrind/*-*-linux