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
commite89f6c88e87a43e451f85ec38c245ba50111ca93 (patch)
tree18f475cf5f5f8d9b4c85193787556298d22fa7c0 /dev-libs/fftw
parentChangeLog fixes (Manifest recommit) (diff)
downloadgentoo-2-e89f6c88e87a43e451f85ec38c245ba50111ca93.tar.gz
gentoo-2-e89f6c88e87a43e451f85ec38c245ba50111ca93.tar.bz2
gentoo-2-e89f6c88e87a43e451f85ec38c245ba50111ca93.zip
Closing #44068.
Diffstat (limited to 'dev-libs/fftw')
-rw-r--r--dev-libs/fftw/ChangeLog5
-rw-r--r--dev-libs/fftw/fftw-2.1.5-r1.ebuild17
2 files changed, 16 insertions, 6 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/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