summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-03-01 19:03:46 +0000
committerJustin Lecher <jlec@gentoo.org>2013-03-01 19:03:46 +0000
commite2c73bdcd0b1401f6c3303a624d8c2946cfd44a9 (patch)
treef9440fef64e9dba5d5aaeb1ecc404481b551b34c /sci-libs
parentStable for sparc, wrt bug #459812 (diff)
downloadgentoo-2-e2c73bdcd0b1401f6c3303a624d8c2946cfd44a9.tar.gz
gentoo-2-e2c73bdcd0b1401f6c3303a624d8c2946cfd44a9.tar.bz2
gentoo-2-e2c73bdcd0b1401f6c3303a624d8c2946cfd44a9.zip
sci-libs/fftw: Block 32bit ABI with USE=mpi on amd64, #459758
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/fftw/ChangeLog5
-rw-r--r--sci-libs/fftw/fftw-3.3.3-r1.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 506c4c80fda8..dadb32d94b92 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/fftw
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.137 2013/02/22 10:11:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.138 2013/03/01 19:03:46 jlec Exp $
+
+ 01 Mar 2013; Justin Lecher <jlec@gentoo.org> fftw-3.3.3-r1.ebuild:
+ Block 32bit ABI with USE=mpi on amd64, #459758
22 Feb 2013; Justin Lecher <jlec@gentoo.org> fftw-2.1.5-r8.ebuild,
fftw-3.2.2.ebuild, fftw-3.2.2-r2.ebuild, metadata.xml:
diff --git a/sci-libs/fftw/fftw-3.3.3-r1.ebuild b/sci-libs/fftw/fftw-3.3.3-r1.ebuild
index 18554f03bef4..51cae77fa230 100644
--- a/sci-libs/fftw/fftw-3.3.3-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.1 2013/02/03 00:54:22 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.2 2013/03/01 19:03:46 jlec Exp $
EAPI=5
@@ -18,6 +18,9 @@ SLOT="3.0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus"
+# there is no abi_x86_32 vort virtual/mpi right now
+REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi ) )"
+
RDEPEND="mpi? ( virtual/mpi )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20121202 )"
DEPEND="${RDEPEND}