Removed 3dnow use flag since building of shared libs is currently broken on k7 (see bug #125218). Also, added patch to fix compilation failure with altivec support.

(Portage version: 2.1_pre7-r5)

4 files changed, 58 insertions, 26 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 4b7825bc56c6..3705be0d4c5d 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,13 @@
 # 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.30 2006/04/03 19:46:41 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.31 2006/04/11 04:58:06 markusle Exp $
+
+  11 Apr 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/fftw-altivec-headers.patch, fftw-3.1.1.ebuild:
+  Removed 3dnow use flag since building of shared libs is currently
+  broken on k7 (see bug #125218). Also, added patch to fix compilation
+  failure when using altivec support. Thanks to SpanKY 
+  <vapier@gentoo.org> for his patch (this fixes bug #129304).
 
 *fftw-3.1.1 (03 Apr 2006)
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index f2f205ca832f..149078f0eee8 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,6 +1,6 @@
-MD5 630fb21502236a506d411740257f03ea ChangeLog 8038
-RMD160 0de48b93199a6935810dfba10bb43acb1fbfb2e1 ChangeLog 8038
-SHA256 509434a4593340d9943cd6e8173f2d1d371ac88d4674591d466ef02109248152 ChangeLog 8038
+MD5 b442aacfa151b6ac5c72ad4778c05b53 ChangeLog 8398
+RMD160 12b5d67219d75bda28ebe0dfa9090da709e262a9 ChangeLog 8398
+SHA256 75257031954af86efea575ead2a7c0703de6865ad0a3bcd290dd70782b2c9c67 ChangeLog 8398
 MD5 b0b309c7dfe2c8566424e91792350f95 fftw-2.1.5-r1.ebuild 4141
 RMD160 72b227d25d9871b5d1d09cfd062d67cd636ddccf fftw-2.1.5-r1.ebuild 4141
 SHA256 6d354780d0c0e6b341842fc1941266db9dd3c90d867b77813b9e1c63d7aa069e fftw-2.1.5-r1.ebuild 4141
@@ -13,9 +13,9 @@ SHA256 cce35d30515b257d3a97c06ad84391af23101a9ab142b3022ca0b0d0a103e501 fftw-3.0
 MD5 1b3f7c7f367fa0164bf31ab90e61d8f5 fftw-3.0.1.ebuild 2103
 RMD160 a32b0e8965d3f48bc2f0b5aac931ffcf96aa1302 fftw-3.0.1.ebuild 2103
 SHA256 46a5f84b3a0e8a357c0580a5c56edc610b516733e062947418fbb4515a22aef9 fftw-3.0.1.ebuild 2103
-MD5 c683abcab0df2db4da719daa20cb6487 fftw-3.1.1.ebuild 2153
-RMD160 37064d67130b58a04ccb17c41847b38df5ae1504 fftw-3.1.1.ebuild 2153
-SHA256 4cc9fe5e367dbc97be7018f425436b234ce89a4e9dcedbbe6c1cea2b1fff08fa fftw-3.1.1.ebuild 2153
+MD5 98a3d842b802baf942b5414102a82fc3 fftw-3.1.1.ebuild 1954
+RMD160 ae52096d4bbccd8b2f5a990d6069d0bfeb3221e1 fftw-3.1.1.ebuild 1954
+SHA256 bb1eb7380b8907e5fee869e1bbce3a7762e9c3434ce196b27003d3f3213e25b8 fftw-3.1.1.ebuild 1954
 MD5 23256637dd0ccf113b366717c812e44e fftw-3.1.ebuild 2151
 RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 fftw-3.1.ebuild 2151
 SHA256 24f733e442a086a4a4e473d5d6d4319302ba0abf1c40cefc0e9d7039635836ad fftw-3.1.ebuild 2151
@@ -43,6 +43,9 @@ SHA256 5756b978bf8b840ec07b71fe2caa22919afc66a970fa69e76ed20dfa96a72b1d files/di
 MD5 49836a250acfcc913276a29736c68a3b files/fftw-3.0.1-altivec.patch 2585
 RMD160 ac3e6a4edd4183570c214e39ec900da432162cfb files/fftw-3.0.1-altivec.patch 2585
 SHA256 48bbd87433b208490f907fc340ab53cabcb8e4259776eadfdf15d963e4af0a27 files/fftw-3.0.1-altivec.patch 2585
+MD5 6ef94bc329f355e86cdee562cc056522 files/fftw-altivec-headers.patch 753
+RMD160 01db3ce957b0c9399045673a6d43c87029169446 files/fftw-altivec-headers.patch 753
+SHA256 0e20d131a9dbde7464f20084dff2f273bbd2152e28580af4886c6ec3b5747dae files/fftw-altivec-headers.patch 753
 MD5 148e5318eca8afb3a4856c820727e69c files/fftw-ppc-macos.1.patch 1429
 RMD160 c61bedd5ba54e526f138525eb7d77bcbb3264a28 files/fftw-ppc-macos.1.patch 1429
 SHA256 d16d27be36800fa582402847e4b6fb0210bcc9718ac750c980b12e1de1419dfb files/fftw-ppc-macos.1.patch 1429
diff --git a/sci-libs/fftw/fftw-3.1.1.ebuild b/sci-libs/fftw/fftw-3.1.1.ebuild
index eec83b3daeca..d1fd7157d480 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.1 2006/04/03 19:46:42 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.1.ebuild,v 1.2 2006/04/11 04:58:06 markusle Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -11,15 +11,22 @@ SRC_URI="http://www.fftw.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="3.0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE="3dnow altivec sse sse2"
+IUSE="altivec sse sse2"
 
 DEPEND=""
 
 src_unpack() {
-	unpack "${P}.tar.gz"
+	unpack ${A}
 	cd "${S}"
+
+	if [[ "${ARCH}" == "ppc-macos" ]];then
+		epatch "${FILESDIR}"/${PN}-ppc-macos.patch
+	fi
+
+	# fix altivec compilation problems (bug #129304)
+	epatch "${FILESDIR}"/${PN}-altivec-headers.patch
+
 	cd "${WORKDIR}"
-	use ppc-macos && epatch "${FILESDIR}"/${PN}-ppc-macos.patch
 	mv ${P} ${P}-single
 	cp -pPR ${P}-single ${P}-double
 }
@@ -36,27 +43,14 @@ src_compile() {
 		myconfdouble="$myconfdouble --enable-sse2"
 	elif use sse; then
 		myconfsingle="$myconfsingle --enable-sse"
-	elif use 3dnow; then
-		myconfsingle="$myconfsingle --enable-k7"
-	fi
-
-	# disable building of shared libs for k7 (c.f. bug #125218)
-	if ! use 3dnow; then
-		myconfsingle="$myconfsingle --enable-shared"
-		myconfdouble="$myconfdouble --enable-shared"
-	fi
-
-
-	# Altivec-support in fftw is currently broken
-	# with gcc 3.4
-	if [ "`gcc-version`" != "3.4" ]; then
-		myconfsingle="$myconfsingle `use_enable altivec`"
 	fi
 
 	cd "${S}-single"
 	econf \
+		--enable-shared \
 		--enable-threads \
 		--enable-float \
+		$(use_enable altivec) \
 		${myconfsingle} || \
 			die "./configure in single failed"
 	emake || die
@@ -64,7 +58,9 @@ src_compile() {
 	#the only difference here is no --enable-float
 	cd "${S}-double"
 	econf \
+		--enable-shared \
 		--enable-threads \
+		$(use_enable altivec) \
 		${myconfdouble} || \
 		die "./configure in double failed"
 	emake || die
diff --git a/sci-libs/fftw/files/fftw-altivec-headers.patch b/sci-libs/fftw/files/fftw-altivec-headers.patch
new file mode 100644
index 000000000000..baade9bfec66
--- /dev/null
+++ b/sci-libs/fftw/files/fftw-altivec-headers.patch
@@ -0,0 +1,26 @@
+--- configure.ac
++++ configure.ac
+@@ -230,6 +230,12 @@
+ fi
+ AC_SUBST(SIMD_CFLAGS)
+ 
++dnl Some headers require the simd cflags (like altivec.h)
++save_CFLAGS="$CFLAGS"
++save_CPPFLAGS="$CPPFLAGS"
++CFLAGS="$CFLAGS $SIMD_CFLAGS"
++CPPFLAGS="$CPPFLAGS $SIMD_CFLAGS"
++
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([libintl.h malloc.h stddef.h stdlib.h string.h strings.h sys/time.h unistd.h limits.h c_asm.h intrinsics.h stdint.h mach/mach_time.h sys/sysctl.h altivec.h])
+@@ -237,6 +243,10 @@
+ dnl intrinsics.h: cray unicos
+ dnl sys/sysctl.h: MacOS X altivec detection
+ 
++dnl restore normal flags
++CFLAGS="$save_CFLAGS"
++CPPFLAGS="$save_CPPFLAGS"
++
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE