Replaced the faulty 'ASM VOLATILE' patch with a proper fix to the offending clobbered bx registers in camm_dpa.h.

(Portage version: 2.1.2_pre1-r1)

4 files changed, 33 insertions, 8 deletions

diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index 454b20b91962..548354c48024 100644
--- a/sci-libs/blas-atlas/ChangeLog
+++ b/sci-libs/blas-atlas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/blas-atlas
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.44 2006/09/11 20:54:00 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.45 2006/09/27 19:14:49 markusle Exp $
+
+  26 Sep 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/atlas-asm-gentoo.patch, blas-atlas-3.7.17.ebuild:
+  Replaced the faulty "ASM VOLATILE" patch with a proper fix to
+  the offending clobbered bx registers in camm_dpa.h. Thanks 
+  to Fabio Rossi <rossi.f@inwind.it> for his patch.
 
 *blas-atlas-3.7.17 (10 Sep 2006)
 
diff --git a/sci-libs/blas-atlas/blas-atlas-3.7.17.ebuild b/sci-libs/blas-atlas/blas-atlas-3.7.17.ebuild
index 245b16ca7b77..e5437a6f13d7 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.7.17.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.7.17.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/blas-atlas/blas-atlas-3.7.17.ebuild,v 1.1 2006/09/11 20:54:00 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.17.ebuild,v 1.2 2006/09/27 19:14:49 markusle Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -8,7 +8,7 @@ DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation"
 HOMEPAGE="http://math-atlas.sourceforge.net/"
 MY_PN=${PN/blas-/}
 SRC_URI="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
-		mirror://gentoo/${MY_PN}-3.7.15-shared-libs.patch.bz2"
+		mirror://gentoo/${MY_PN}-${PV}-shared-libs.patch.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -37,14 +37,21 @@ pkg_setup() {
 	ewarn "performance of the resulting libraries will be degraded"
 	ewarn "considerably."
 	echo
-	epause 8
+	ewarn "Also, if you experience failing SANITY tests during"
+	ewarn "atlas' compile please try passing -mfpmath=387; this"
+	ewarn "option might also result in much better performance"
+	ewarn "than using then sse instruction set depending on your"
+	ewarn "CPU."
+	echo
+	epause 10
 }
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch "${DISTDIR}"/${MY_PN}-3.7.15-shared-libs.patch.bz2
+	epatch "${DISTDIR}"/${MY_PN}-${PV}-shared-libs.patch.bz2
+	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
 
 	# make sure shared libs link against proper libraries
 	if [[ ${FORTRANC} == "gfortran" ]]; then
diff --git a/sci-libs/blas-atlas/files/atlas-asm-gentoo.patch b/sci-libs/blas-atlas/files/atlas-asm-gentoo.patch
new file mode 100644
index 000000000000..ca5a7a8eeb51
--- /dev/null
+++ b/sci-libs/blas-atlas/files/atlas-asm-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Naur ATLAS/include/contrib/camm_dpa.h ATLAS-new/include/contrib/camm_dpa.h
+--- ATLAS/include/contrib/camm_dpa.h	2006-09-09 15:33:15.000000000 -0400
++++ ATLAS-new/include/contrib/camm_dpa.h	2006-09-26 10:18:24.000000000 -0400
+@@ -1619,7 +1619,7 @@
+ #if defined(SCPLX) || (defined(DCPLX) && defined(ATL_SSE2))
+ 	 ,"m" (w)
+ #endif
+-	 :"ax","bx","cx","dx","si","di");
++	 :"ax","cx","dx","si","di");
+ 
+ 
+ }
diff --git a/sci-libs/blas-atlas/files/digest-blas-atlas-3.7.17 b/sci-libs/blas-atlas/files/digest-blas-atlas-3.7.17
index cdff5f8d0a76..d9f2afc48dd8 100644
--- a/sci-libs/blas-atlas/files/digest-blas-atlas-3.7.17
+++ b/sci-libs/blas-atlas/files/digest-blas-atlas-3.7.17
@@ -1,6 +1,6 @@
-MD5 4d85e976f592f02afa54a82d3890ff22 atlas-3.7.15-shared-libs.patch.bz2 6769
-RMD160 6c9922e4c6236a1c6bb07af3862d023678d86a31 atlas-3.7.15-shared-libs.patch.bz2 6769
-SHA256 6539ea2ecff0e7d84d1968fb9cf9a60e1300e505dd1882f74c386e3dd63baa6d atlas-3.7.15-shared-libs.patch.bz2 6769
+MD5 101af1b5d02319c77672a5a77fecf24b atlas-3.7.17-shared-libs.patch.bz2 11666
+RMD160 6db89c885edb40e0fd989f434bfc5fb6ca78cca7 atlas-3.7.17-shared-libs.patch.bz2 11666
+SHA256 79afe15964e22cc9e8fd13f660734255703e6d7cdfda7638b9226b832f733d9e atlas-3.7.17-shared-libs.patch.bz2 11666
 MD5 00f68b5ccdc4bbbaeefa086e6d8e38ff atlas3.7.17.tar.bz2 1746646
 RMD160 6545fa2ae68667d12ec36e01adccc85607de7b5d atlas3.7.17.tar.bz2 1746646
 SHA256 35a20f7a97bf1da14030aebfed39b14cc88d241fa0da4993bb995c112fb2232c atlas3.7.17.tar.bz2 1746646