diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2012-02-17 01:36:14 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-02-17 01:36:14 +0000 |
| commit | aba737079f00e4e225ce7c70d1dd500bd1c9afa9 (patch) | |
| tree | c3c676fd9b2a46713f85c41c934be92c83acea25 | |
| parent | Version bump, for slot 3. (diff) | |
| download | gentoo-2-aba737079f00e4e225ce7c70d1dd500bd1c9afa9.tar.gz gentoo-2-aba737079f00e4e225ce7c70d1dd500bd1c9afa9.tar.bz2 gentoo-2-aba737079f00e4e225ce7c70d1dd500bd1c9afa9.zip | |
Fix 3.6.1-r2 to autoreconf with automake-1.11.x, bug #403779
(Portage version: 2.1.10.44/cvs/Linux x86_64)
| -rw-r--r-- | dev-util/valgrind/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/valgrind/files/valgrind-3.6.1-automake-1.11.3.patch | 26 | ||||
| -rw-r--r-- | dev-util/valgrind/valgrind-3.6.1-r2.ebuild | 7 |
3 files changed, 36 insertions, 3 deletions
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog index a76a389d7e95..a063ade222a0 100644 --- a/dev-util/valgrind/ChangeLog +++ b/dev-util/valgrind/ChangeLog @@ -1,6 +1,10 @@ # 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.135 2012/02/14 01:19:47 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.136 2012/02/17 01:36:13 blueness Exp $ + + 17 Feb 2012; Anthony G. Basile <blueness@gentoo.org> + valgrind-3.6.1-r2.ebuild, +files/valgrind-3.6.1-automake-1.11.3.patch: + Fix 3.6.1-r2 to autoreconf with automake-1.11.x, bug #403779 *valgrind-3.7.0-r3 (14 Feb 2012) diff --git a/dev-util/valgrind/files/valgrind-3.6.1-automake-1.11.3.patch b/dev-util/valgrind/files/valgrind-3.6.1-automake-1.11.3.patch new file mode 100644 index 000000000000..4c1eda338505 --- /dev/null +++ b/dev-util/valgrind/files/valgrind-3.6.1-automake-1.11.3.patch @@ -0,0 +1,26 @@ +Backport of valgrind-3.7.0-automake-1.11.2.patch + +Retain the old behavior of the build system even with automake 1.11.3. + +Reported-by: Oleg Bulatov <dmage@bk.ru> +X-Gentoo-Bug: 397429 +X-Gentoo-Bug: 403779 +X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=397429 +X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=403779 +X-KDE-Bug: 290719 +X-KDE-Bug-URL: https://bugs.kde.org/show_bug.cgi?id=290719 +Signed-off-by: Anthony G. Basile <blueness@gentoo.org> + +diff -Naur valgrind-3.6.1.orig//Makefile.am valgrind-3.6.1/Makefile.am +--- valgrind-3.6.1.orig//Makefile.am 2010-10-20 16:19:45.000000000 -0400 ++++ valgrind-3.6.1/Makefile.am 2012-02-16 20:27:23.000000000 -0500 +@@ -57,7 +57,8 @@ + # default.supp, as it is built from the base .supp files at compile-time. + dist_noinst_DATA = $(SUPP_FILES) + +-pkglib_DATA = default.supp ++vgdatadir = $(pkglibdir) ++vgdata_DATA = default.supp + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = valgrind.pc diff --git a/dev-util/valgrind/valgrind-3.6.1-r2.ebuild b/dev-util/valgrind/valgrind-3.6.1-r2.ebuild index b67b98aab141..ff800a39939b 100644 --- a/dev-util/valgrind/valgrind-3.6.1-r2.ebuild +++ b/dev-util/valgrind/valgrind-3.6.1-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.6.1-r2.ebuild,v 1.3 2011/10/28 00:35:54 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.6.1-r2.ebuild,v 1.4 2012/02/17 01:36:13 blueness Exp $ EAPI=2 inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils @@ -50,6 +50,9 @@ src_prepare() { # Allow valgrind to build against glibc-2.14, bug #378157 epatch "${FILESDIR}"/${PN}-3.6.1-glibc-2.14.patch + # Fix stricter use of dir variables, bugs #397429 and #403779 + epatch "${FILESDIR}"/${PN}-3.6.1-automake-1.11.3.patch + # Regenerate autotools files eautoreconf } |