diff options
| author |   Maurice van der Pot <griffon26@gentoo.org> | 2006-03-07 18:38:19 +0000 |
|---|---|---|
| committer | Maurice van der Pot <griffon26@gentoo.org> | 2006-03-07 18:38:19 +0000 |
| commit | 2b28d7bcb5b2d0e52b8419edee9bf02fc61f3d29 (patch) | |
| tree | ef9642a1e45f4868e3bc56aa2f6b7f4ab9e7e7da /dev-util | |
| parent | Marked ppc stable for bug #122648, thanks to mfproroc for testing. (diff) | |
| download | gentoo-2-2b28d7bcb5b2d0e52b8419edee9bf02fc61f3d29.tar.gz gentoo-2-2b28d7bcb5b2d0e52b8419edee9bf02fc61f3d29.tar.bz2 gentoo-2-2b28d7bcb5b2d0e52b8419edee9bf02fc61f3d29.zip | |
Fixed problem on amd64 without multilib (bug #114407)
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/valgrind/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-util/valgrind/Manifest | 13 | ||||
| -rw-r--r-- | dev-util/valgrind/files/valgrind-3.1.0-amd64-nomultilib-fix.patch | 11 | ||||
| -rw-r--r-- | dev-util/valgrind/valgrind-3.1.0.ebuild | 7 |
4 files changed, 26 insertions, 15 deletions
diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog index 82da042f46e0..c7ab28b6f224 100644 --- a/dev-util/valgrind/ChangeLog +++ b/dev-util/valgrind/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/valgrind -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.56 2005/12/05 18:37:01 griffon26 Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.57 2006/03/07 18:38:19 griffon26 Exp $ + + 07 Mar 2006; Maurice van der Pot <griffon26@gentoo.org> + +files/valgrind-3.1.0-amd64-nomultilib-fix.patch, valgrind-3.1.0.ebuild: + Added patch created by Marco Matthies <gentoo-bugzilla@moinmarco.de> for + bug #114407 reported by Scott Robert Ladd <gentoo@coyotegulch.com>. This + problem occurred only on amd64 without multilib. 03 Dec 2005; Maurice van der Pot <griffon26@gentoo.org> valgrind-3.1.0.ebuild: diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest index 5ee2a9aedd09..99081d4dcf79 100644 --- a/dev-util/valgrind/Manifest +++ b/dev-util/valgrind/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 df3003fc7d32d481b23fe4125bdc60f5 ChangeLog 6728 MD5 26192577445b467e528408118f7ee6ec files/digest-valgrind-2.2.0-r2 139 MD5 c6fe697b4c25fb9e5c7482496ebabf06 files/digest-valgrind-2.4.0 140 @@ -17,6 +14,7 @@ MD5 d177de2c2f79d24d4ad74644ee49f667 files/valgrind-2.4.1-static-const.patch 439 MD5 24971d28d91da6c61168fa217d10b47b files/valgrind-3.0.0-pie-fix.patch 864 MD5 9af0c7aae878323f117ea148ee2930d4 files/valgrind-3.0.1-mfence.patch 600 MD5 fc133b72d5c0341cc194c9cee839c058 files/valgrind-3.0.1-pic-fix.patch 3565 +MD5 2622d413602e236208128310f4736453 files/valgrind-3.1.0-amd64-nomultilib-fix.patch 302 MD5 799f0b61a3a686b4074bd61acc572c5c metadata.xml 1003 MD5 9c6171e63f2c500b26cd6c2dd98d42e8 valgrind-2.2.0-r2.ebuild 1716 MD5 98fd3a4e78d2c75a2de9d2f7595a649c valgrind-2.4.0.ebuild 1407 @@ -24,11 +22,4 @@ MD5 cb18085a00f509803e6e539543cb20f9 valgrind-2.4.1.ebuild 1881 MD5 16efe20081a8edc14768a1ea1e4664be valgrind-3.0.0.ebuild 1799 MD5 c824aeed84391f896caea42dc444afc6 valgrind-3.0.1-r1.ebuild 1887 MD5 fc311d6ac7b19d831f6e18e9588c2053 valgrind-3.0.1.ebuild 1690 -MD5 0cb8b50fb0b3ea6de23044336c0126b0 valgrind-3.1.0.ebuild 2172 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDlIjcMGnpIbeahxwRAiOuAJ42Idr0CWGsfLftODoGqHAg04fMWQCgrruP -x0qX9xuVSxynxHpxx950fgk= -=Af7M ------END PGP SIGNATURE----- +MD5 e91231a882274018b66335a50e8861ad valgrind-3.1.0.ebuild 2354 diff --git a/dev-util/valgrind/files/valgrind-3.1.0-amd64-nomultilib-fix.patch b/dev-util/valgrind/files/valgrind-3.1.0-amd64-nomultilib-fix.patch new file mode 100644 index 000000000000..64ab58ca5469 --- /dev/null +++ b/dev-util/valgrind/files/valgrind-3.1.0-amd64-nomultilib-fix.patch @@ -0,0 +1,11 @@ +--- configure.bak 2006-02-20 23:50:24.000000000 +0100 ++++ configure 2006-02-20 23:50:47.000000000 +0100 +@@ -4138,7 +4138,7 @@ + + + +-if test x$VG_PLATFORM = xx86-linux -o x$VG_PLATFORM = xamd64-linux; then ++if test x$VG_PLATFORM = xx86-linux; then + VG_X86_LINUX_TRUE= + VG_X86_LINUX_FALSE='#' + else diff --git a/dev-util/valgrind/valgrind-3.1.0.ebuild b/dev-util/valgrind/valgrind-3.1.0.ebuild index 53da3ed7fb77..ea2ec2fb3469 100644 --- a/dev-util/valgrind/valgrind-3.1.0.ebuild +++ b/dev-util/valgrind/valgrind-3.1.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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.1.0.ebuild,v 1.2 2005/12/05 18:37:01 griffon26 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.1.0.ebuild,v 1.3 2006/03/07 18:38:19 griffon26 Exp $ inherit eutils flag-o-matic @@ -34,6 +34,9 @@ src_unpack() { einfo "Regenerating autotools files..." autoconf || die "autoconf failed" automake || die "automake failed" + + # fix for amd64 no-multilib profile till valgrind 3.2.0 is out (bug #114407) + use amd64 && (has_multilib_profile || epatch "${FILESDIR}/valgrind-3.1.0-amd64-nomultilib-fix.patch") } src_compile() { |