summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2004-03-09 13:03:50 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2004-03-09 13:03:50 +0000
commitfb7a34c71fba28a24cae637e30a1b247a408d265 (patch)
tree5aa17bac6206286af201830153c1462a56370952 /dev-libs/fftw
parentChangeLog fixes (diff)
downloadhistorical-fb7a34c71fba28a24cae637e30a1b247a408d265.tar.gz
historical-fb7a34c71fba28a24cae637e30a1b247a408d265.tar.bz2
historical-fb7a34c71fba28a24cae637e30a1b247a408d265.zip
Closing #44068.
Diffstat (limited to 'dev-libs/fftw')
-rw-r--r--dev-libs/fftw/ChangeLog5
-rw-r--r--dev-libs/fftw/Manifest4
-rw-r--r--dev-libs/fftw/fftw-2.1.5-r1.ebuild17
3 files changed, 18 insertions, 8 deletions
diff --git a/dev-libs/fftw/ChangeLog b/dev-libs/fftw/ChangeLog
index b4bbc3468436..70f042fb97b0 100644
--- a/dev-libs/fftw/ChangeLog
+++ b/dev-libs/fftw/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/fftw
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/ChangeLog,v 1.16 2004/03/04 09:37:42 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/ChangeLog,v 1.17 2004/03/09 13:03:49 aliz Exp $
+
+ 09 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> fftw-2.1.5-r1.ebuild:
+ Adding amd64 keyword. Closing #44068.
*fftw-2.1.5-r1 (04 Mar 2004)
diff --git a/dev-libs/fftw/Manifest b/dev-libs/fftw/Manifest
index 4a4fbfa85055..6167dc20b60b 100644
--- a/dev-libs/fftw/Manifest
+++ b/dev-libs/fftw/Manifest
@@ -1,8 +1,8 @@
MD5 32d48f5e18034052ebc8e294c0ed1e83 fftw-3.0.1.ebuild 2397
MD5 258b451cd01490ce7b8303a8a2e5d437 fftw-2.1.3-r1.ebuild 3349
-MD5 12038a1bdfdaf083ca7a75e4bb137a39 fftw-2.1.5-r1.ebuild 3949
+MD5 7928c47edca350ca1a33518660b1db68 fftw-2.1.5-r1.ebuild 4072
MD5 9e62b2fde5336fb8cbd0769051dad906 fftw-2.1.5.ebuild 3889
-MD5 ffde743741f280b7748af6004417494b ChangeLog 2380
+MD5 1632f97fb1283105014f5979a10b26f3 ChangeLog 2487
MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
MD5 236dda9695005c9f306fb2c55f020686 files/digest-fftw-2.1.5 63
MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1 63
diff --git a/dev-libs/fftw/fftw-2.1.5-r1.ebuild b/dev-libs/fftw/fftw-2.1.5-r1.ebuild
index 5211e54f1c14..9da916cbf8e4 100644
--- a/dev-libs/fftw/fftw-2.1.5-r1.ebuild
+++ b/dev-libs/fftw/fftw-2.1.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/fftw-2.1.5-r1.ebuild,v 1.1 2004/03/04 09:37:42 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/fftw-2.1.5-r1.ebuild,v 1.2 2004/03/09 13:03:50 aliz Exp $
inherit flag-o-matic
@@ -16,14 +16,16 @@ SLOT="2.1"
LICENSE="GPL-2"
#remove ~'s on ppc and sparc when removig on x86 (as per recent discussion on -core)
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 ppc sparc alpha ~amd64"
#this one is reported to cause trouble on pentium4 m series
filter-mfpmath "sse"
#here I need (surprise) to increase optimization:
#--enable-i386-hacks requires -fomit-frame-pointer to work properly
-is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
+if [ "${ARCH}" != "amd64" ]; then
+ is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
+fi
pkg_setup() {
einfo ""
@@ -54,6 +56,13 @@ src_unpack() {
src_compile() {
local myconf=""
use mpi && myconf="${myconf} --enable-mpi"
+
+ if [ "${ARCH}" == "amd64" ]; then
+ myconf="${myconf} --disable-i386-hacks"
+ else
+ myconf="${myconf} --enable-i386-hacks"
+ fi
+
#mpi is not a valid flag yet. In this revision it is used merely to block --enable-mpi option
#it might be needed if it is decided that lam is an optional dependence
@@ -63,7 +72,6 @@ src_compile() {
--enable-threads \
--enable-type-prefix \
--enable-float \
- --enable-i386-hacks \
--enable-vec-recurse \
${myconf} || die "./configure failed"
emake || die
@@ -74,7 +82,6 @@ src_compile() {
--enable-shared \
--enable-threads \
--enable-type-prefix \
- --enable-i386-hacks \
--enable-vec-recurse \
${myconf} || die "./configure failed"
emake || die