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

Package-Manager: portage-2.1.2_pre1-r1

5 files changed, 49 insertions, 20 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/Manifest b/sci-libs/blas-atlas/Manifest
index 9818fe62091c..9801de5678c4 100644
--- a/sci-libs/blas-atlas/Manifest
+++ b/sci-libs/blas-atlas/Manifest
@@ -10,6 +10,10 @@ AUX 3.7.11-ppc-configure.patch 467 RMD160 677632d42ad38c49aec1584fab8f4f5609b55f
 MD5 50d2edcd9e681726f10e06d64a7a8eb2 files/3.7.11-ppc-configure.patch 467
 RMD160 677632d42ad38c49aec1584fab8f4f5609b55f51 files/3.7.11-ppc-configure.patch 467
 SHA256 6172bd66891a260d8d4b84f461001bf20459fdef30a5be730f39348068bede94 files/3.7.11-ppc-configure.patch 467
+AUX atlas-asm-gentoo.patch 408 RMD160 3cea2f4a5a96ec22a4d0cfc78d691198a2d1a0da SHA1 493d066be68c66cca1f0c906d588da8983ec7afa SHA256 00f9247d422c758ef8ff43446a36a6dbb7962f94e5d01307318c87a90a78355b
+MD5 fb9ca923b595b67967a744339e7a32a6 files/atlas-asm-gentoo.patch 408
+RMD160 3cea2f4a5a96ec22a4d0cfc78d691198a2d1a0da files/atlas-asm-gentoo.patch 408
+SHA256 00f9247d422c758ef8ff43446a36a6dbb7962f94e5d01307318c87a90a78355b files/atlas-asm-gentoo.patch 408
 AUX c-ATLAS 497 RMD160 1bca887c53b7132f434a8e6e023721a7a7d6e567 SHA1 8dc57e828646aaa1d2de089a187c7b69973bd9b4 SHA256 4d135a53bf4bce2a373f2154286876bbba5a78ccab48834e3db3a83714f224c8
 MD5 73bb69e091e5629e3d47ec813d560223 files/c-ATLAS 497
 RMD160 1bca887c53b7132f434a8e6e023721a7a7d6e567 files/c-ATLAS 497
@@ -50,7 +54,7 @@ AUX war 545 RMD160 6f44c25e739703f988180959608094aa633db7bf SHA1 d90a66e57395e01
 MD5 13d26350d75e6993f1b3ec48ca97f14e files/war 545
 RMD160 6f44c25e739703f988180959608094aa633db7bf files/war 545
 SHA256 696a8e1cc3918ce5d19f0aa41250d5f052244527a5e3804b025db7938f06ae7b files/war 545
-DIST atlas-3.7.15-shared-libs.patch.bz2 6769 RMD160 6c9922e4c6236a1c6bb07af3862d023678d86a31 SHA1 d28c49f7506df70320b543790f40491880422207 SHA256 6539ea2ecff0e7d84d1968fb9cf9a60e1300e505dd1882f74c386e3dd63baa6d
+DIST atlas-3.7.17-shared-libs.patch.bz2 11666 RMD160 6db89c885edb40e0fd989f434bfc5fb6ca78cca7 SHA1 342f247e43cee2bd03cbed278887b197dc8fe2e0 SHA256 79afe15964e22cc9e8fd13f660734255703e6d7cdfda7638b9226b832f733d9e
 DIST atlas3.6.0-shared-libs.1.patch.bz2 5148 RMD160 96f9357049fb22e0955ff1375630e542b0bdee7c SHA1 7ad4a9d0dacf75ae4ad308c2f0d1dfa9b17e49f6 SHA256 f669030bf042808a4f4a92c746f3fd3067597d0ec94756ecac63bc331109c565
 DIST atlas3.6.0-shared-libs.3.patch.bz2 5140 RMD160 d6085b2729f2b8ed917b1d0a85339bd07f4192f9 SHA1 a9f234416bdbc1a752196f48707a066687fdfeb2 SHA256 9cd442b35c869c90b569154bf82a8f18c92fb5e0221c26c7cff23b0a7e9e2cd8
 DIST atlas3.6.0-shared-libs.patch.bz2 5140 RMD160 2c266377cd60b24b7710fcf1d6d4be9c32797d64 SHA1 ec4c87075c03133e0f1e2fe22cd9768124c758b7 SHA256 6fd8281d42de14d34e4f1e25cb9f4b142f6e66c8dc1030763761f8033eb38e89
@@ -77,14 +81,14 @@ EBUILD blas-atlas-3.7.11.ebuild 5065 RMD160 b923c02aa00523ec8d1c420fb4b01be3e382
 MD5 a9e757e1b23f76c03ead45ec334954bd blas-atlas-3.7.11.ebuild 5065
 RMD160 b923c02aa00523ec8d1c420fb4b01be3e382f59c blas-atlas-3.7.11.ebuild 5065
 SHA256 70f0ed426b55b9a65fd0e4c7cd3dfbdd39437ddcc490e6447d2972889c8c88f0 blas-atlas-3.7.11.ebuild 5065
-EBUILD blas-atlas-3.7.17.ebuild 4224 RMD160 e7ba9082de0f6208af301d75a24ac0a34a53cde8 SHA1 7fe98792dfb832b7ae3077df08c9953ab6b809d6 SHA256 08d2280db780d577bbbb0a56e8552021fdcfee7e3300ec76e826dfe22c056eb3
-MD5 ee00506e1f69a3c8b15df2ae211824c0 blas-atlas-3.7.17.ebuild 4224
-RMD160 e7ba9082de0f6208af301d75a24ac0a34a53cde8 blas-atlas-3.7.17.ebuild 4224
-SHA256 08d2280db780d577bbbb0a56e8552021fdcfee7e3300ec76e826dfe22c056eb3 blas-atlas-3.7.17.ebuild 4224
-MISC ChangeLog 10424 RMD160 a7d15c45fddb8f939d17af9e80127647e717ca98 SHA1 9e69d289bb8ed383077821f6058effea2172c091 SHA256 bb786a0dd8b6b90f91acd0eb55179bb8af9d449ec5c488c0dc3c27703f3bfcd5
-MD5 99e88d1b667bdf6f5dfa0b1253f197ce ChangeLog 10424
-RMD160 a7d15c45fddb8f939d17af9e80127647e717ca98 ChangeLog 10424
-SHA256 bb786a0dd8b6b90f91acd0eb55179bb8af9d449ec5c488c0dc3c27703f3bfcd5 ChangeLog 10424
+EBUILD blas-atlas-3.7.17.ebuild 4538 RMD160 593267363e45cc956392d4f7ebd5524540a6458a SHA1 b304be2752597a9c52ea766c465f90cd1d002231 SHA256 f076c94180e309799022cbde4ae5e07da9cb98eca1a1eadb82358b8762fae393
+MD5 776aaf0028940e23fa9a9fedf6b3e81e blas-atlas-3.7.17.ebuild 4538
+RMD160 593267363e45cc956392d4f7ebd5524540a6458a blas-atlas-3.7.17.ebuild 4538
+SHA256 f076c94180e309799022cbde4ae5e07da9cb98eca1a1eadb82358b8762fae393 blas-atlas-3.7.17.ebuild 4538
+MISC ChangeLog 10715 RMD160 fdf438e99c8f77ad940cdeb0a828e08d9daf74d0 SHA1 8756e4a87e039ce6a750f2802fcd9060eb81eae6 SHA256 562a96a01ea8eaa426fe2b9d0eef22f128439938d040e9efac3d11977b40c0e2
+MD5 e521b360a04782985cb4a90c6cf41454 ChangeLog 10715
+RMD160 fdf438e99c8f77ad940cdeb0a828e08d9daf74d0 ChangeLog 10715
+SHA256 562a96a01ea8eaa426fe2b9d0eef22f128439938d040e9efac3d11977b40c0e2 ChangeLog 10715
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -104,6 +108,6 @@ SHA256 015b28906b69dde5c93402427c2a0c289671cdb32e542244eaec56b8f7b649ad files/di
 MD5 79d482b7d304a40a4c4fde6dd8151ed5 files/digest-blas-atlas-3.7.11-r1 518
 RMD160 6f582ac7a7f762ba65f69797758fa3b816491e0c files/digest-blas-atlas-3.7.11-r1 518
 SHA256 015b28906b69dde5c93402427c2a0c289671cdb32e542244eaec56b8f7b649ad files/digest-blas-atlas-3.7.11-r1 518
-MD5 af950294d5367b9bd510e7a0b6848427 files/digest-blas-atlas-3.7.17 518
-RMD160 1783b523ff2a57a54910cd341b9cea3faeb355a4 files/digest-blas-atlas-3.7.17 518
-SHA256 29f83ed41b9dfec57f4169fe0e627522ca5af74fddba5d3946da9ae3e2bad131 files/digest-blas-atlas-3.7.17 518
+MD5 21e605657d7c4c1ae0410393eb966cbd files/digest-blas-atlas-3.7.17 521
+RMD160 fe12684d90e450492a51af52bbb07047a4bf39c3 files/digest-blas-atlas-3.7.17 521
+SHA256 514d26ac17f6158d6a65fa00756cd8c92258a8cfbc591f89911ac36a2e719734 files/digest-blas-atlas-3.7.17 521
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