Bug #131320 - Use altivec only for single precision - it doesn't work with double or higher precision. Add long double variant and factor out common bits of econf. Might want to lock it down to arches that it makes a difference on in future.

Package-Manager: portage-2.1_pre10-r5

3 files changed, 38 insertions, 17 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index a4c036edb904..f2635994c391 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.32 2006/04/27 22:27:57 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.33 2006/05/11 09:59:33 robbat2 Exp $
+
+  11 May 2006; Robin H. Johnson <robbat2@gentoo.org> fftw-3.1.1.ebuild:
+  Bug #131320 - Use altivec only for single precision - it doesn't work with
+  double or higher precision. Add long double variant and factor out common
+  bits of econf. Might want to lock it down to arches that it makes a
+  difference on in future.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-fftw-2.1.5-r1,
   files/digest-fftw-3.0.1-r1, files/digest-fftw-3.0.1-r2, Manifest:
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index d0b4539c7477..b7d17144316d 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -38,18 +38,18 @@ EBUILD fftw-3.0.1.ebuild 2103 RMD160 a32b0e8965d3f48bc2f0b5aac931ffcf96aa1302 SH
 MD5 1b3f7c7f367fa0164bf31ab90e61d8f5 fftw-3.0.1.ebuild 2103
 RMD160 a32b0e8965d3f48bc2f0b5aac931ffcf96aa1302 fftw-3.0.1.ebuild 2103
 SHA256 9c0f3b39259be3d778db1d306e8fb712684a3f1d8b3f1189bbd38cadf10707c4 fftw-3.0.1.ebuild 2103
-EBUILD fftw-3.1.1.ebuild 1975 RMD160 1aea11d4a42ebd15a0380fb7ee99a00c55fd7ff1 SHA1 28864fea78e723f7ea9d04909970f0c737e8f535 SHA256 0de2390d996a766b17928e750c821142ce493e1f6fefb245c904ce1ce3c82838 size 1975
-MD5 4d75075b2b268b786353b045647767fe fftw-3.1.1.ebuild 1975
-RMD160 1aea11d4a42ebd15a0380fb7ee99a00c55fd7ff1 fftw-3.1.1.ebuild 1975
-SHA256 0de2390d996a766b17928e750c821142ce493e1f6fefb245c904ce1ce3c82838 fftw-3.1.1.ebuild 1975
+EBUILD fftw-3.1.1.ebuild 2383 RMD160 02d9a2db448a3601b0767eed3217174e5cc65163 SHA1 eeb2a93f79c5337b28e0f4c4a97cac03bf360afc SHA256 ad451bcd9070e6a6c934485ec7f9eb7bd30ffe6be636b903cc86e19027ff722c size 2383
+MD5 6fbb817645594fa74dd5089bc4974bf3 fftw-3.1.1.ebuild 2383
+RMD160 02d9a2db448a3601b0767eed3217174e5cc65163 fftw-3.1.1.ebuild 2383
+SHA256 ad451bcd9070e6a6c934485ec7f9eb7bd30ffe6be636b903cc86e19027ff722c fftw-3.1.1.ebuild 2383
 EBUILD fftw-3.1.ebuild 2151 RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 SHA1 7bbf2ceb5034e7adca9bac427a91967a4689e14b SHA256 24f733e442a086a4a4e473d5d6d4319302ba0abf1c40cefc0e9d7039635836ad size 2151
 MD5 23256637dd0ccf113b366717c812e44e fftw-3.1.ebuild 2151
 RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 fftw-3.1.ebuild 2151
 SHA256 24f733e442a086a4a4e473d5d6d4319302ba0abf1c40cefc0e9d7039635836ad fftw-3.1.ebuild 2151
-MISC ChangeLog 8583 RMD160 d9dacab1c1c7dc7c42593d0cdb777091bcf44fba SHA1 60a55e3aacd611e985c59bc1d7f9ea11488dabb8 SHA256 632ffd9e61d982514265f24b3bfbb904b09efa76e35737fd0ec78e98f7087b9d size 8583
-MD5 5632242191e82716ebf6e3322e1bf2c2 ChangeLog 8583
-RMD160 d9dacab1c1c7dc7c42593d0cdb777091bcf44fba ChangeLog 8583
-SHA256 632ffd9e61d982514265f24b3bfbb904b09efa76e35737fd0ec78e98f7087b9d ChangeLog 8583
+MISC ChangeLog 8906 RMD160 1d0a7df122e7cd907bcfc1e82a05768e3c2824ee SHA1 3a94861dfc2bd40707486113e4ad764c6e2fab98 SHA256 1d0899eb4d4a7370563e88563888424028baa7e40cf328d8611f2273204a0538 size 8906
+MD5 583f33bb44e22fbe22feadbdc948c8c5 ChangeLog 8906
+RMD160 1d0a7df122e7cd907bcfc1e82a05768e3c2824ee ChangeLog 8906
+SHA256 1d0899eb4d4a7370563e88563888424028baa7e40cf328d8611f2273204a0538 ChangeLog 8906
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 size 156
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
diff --git a/sci-libs/fftw/fftw-3.1.1.ebuild b/sci-libs/fftw/fftw-3.1.1.ebuild
index d0078360caba..06a0d5e449d4 100644
--- a/sci-libs/fftw/fftw-3.1.1.ebuild
+++ b/sci-libs/fftw/fftw-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.1.ebuild,v 1.3 2006/04/11 06:07:07 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.1.ebuild,v 1.4 2006/05/11 09:59:33 robbat2 Exp $
 
 inherit flag-o-matic eutils toolchain-funcs autotools
 
@@ -30,14 +30,17 @@ src_unpack() {
 	cd "${WORKDIR}"
 	mv ${P} ${P}-single
 	cp -pPR ${P}-single ${P}-double
+	cp -pPR ${P}-single ${P}-longdouble
 }
 
 src_compile() {
 	# filter -Os according to docs
 	replace-flags -Os -O2
 
+	local myconfcommon="--enable-shared --enable-threads"
 	local myconfsingle=""
 	local myconfdouble=""
+	local myconflongdouble=""
 
 	if use sse2; then
 		myconfsingle="$myconfsingle --enable-sse"
@@ -45,13 +48,15 @@ src_compile() {
 	elif use sse; then
 		myconfsingle="$myconfsingle --enable-sse"
 	fi
+	# altivec only helps floats, not doubles
+	if use altivec; then
+		myconfsingle="$myconfsingle --enable-altivec"
+	fi
 
 	cd "${S}-single"
 	econf \
-		--enable-shared \
-		--enable-threads \
+		${myconfcommon} \
 		--enable-float \
-		$(use_enable altivec) \
 		${myconfsingle} || \
 			die "./configure in single failed"
 	emake || die
@@ -59,16 +64,23 @@ src_compile() {
 	#the only difference here is no --enable-float
 	cd "${S}-double"
 	econf \
-		--enable-shared \
-		--enable-threads \
-		$(use_enable altivec) \
+		${myconfcommon} \
 		${myconfdouble} || \
 		die "./configure in double failed"
 	emake || die
+	
+	#the only difference here is --enable-long-double
+	cd "${S}-longdouble"
+	econf \
+		${myconfcommon} \
+		--enable-long-double \
+		${myconflongdouble} || \
+		die "./configure in long double failed"
+	emake || die
 }
 
 src_install () {
-	#both builds are installed in the same place
+	#all builds are installed in the same place
 	#libs have distinuguished names; include files, docs etc. identical.
 	cd "${S}-single"
 	make DESTDIR=${D} install || die
@@ -76,6 +88,9 @@ src_install () {
 	cd "${S}-double"
 	make DESTDIR=${D} install || die
 
+	cd "${S}-longdouble"
+	make DESTDIR=${D} install || die
+
 	# Install documentation.
 	cd "${S}-single"