Added patches to fix infinite recursion during bootstrapping and to improve Core2Duo detection (fixes bug #233614).

Package-Manager: portage-2.2_rc5/cvs/Linux 2.6.26-SENTINEL-1 i686

5 files changed, 85 insertions, 4 deletions

diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index 25c06e3be180..3d36cebc94c1 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.82 2008/07/23 14:43:51 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.83 2008/08/03 17:54:18 markusle Exp $
+
+  03 Aug 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/blas-atlas-3.9.1-Core2Duo-detect.patch,
+  +files/blas-atlas-3.9.1-timing.patch, blas-atlas-3.9.1.ebuild:
+  Added patches to fix infinite recursion during bootstrapping and to
+  improve Core2Duo detection (fixes bug #233614).
 
 *blas-atlas-3.9.1 (22 Jul 2008)
 
diff --git a/sci-libs/blas-atlas/Manifest b/sci-libs/blas-atlas/Manifest
index cef4c0a250d4..da5488d610d4 100644
--- a/sci-libs/blas-atlas/Manifest
+++ b/sci-libs/blas-atlas/Manifest
@@ -4,6 +4,8 @@ AUX 3.7.11-ppc-configure.patch 467 RMD160 677632d42ad38c49aec1584fab8f4f5609b55f
 AUX atlas-3.7.39-decl-fix.patch 2791 RMD160 b84743fb2f255719197f7481c8826e7b2360044f SHA1 80008056fcafdbefb9e3538ef962c93d5a0df1ca SHA256 d5a8c69c2e196e946c61003b6bf3088b05a6b13b428efa8be8ef7eb54bdf3670
 AUX atlas-3.9.0-decl-fix.patch 2465 RMD160 d1e52b25e04d0f4a3417cc45777a9eb2f114e27d SHA1 7f82b74e9f4366021981a5a1406b344f6ce57469 SHA256 14b20fddedb6948d5caf517a20d702bbbcd8be8771cf1a19c2400dfa2865cf79
 AUX atlas-asm-gentoo.patch 408 RMD160 3cea2f4a5a96ec22a4d0cfc78d691198a2d1a0da SHA1 493d066be68c66cca1f0c906d588da8983ec7afa SHA256 00f9247d422c758ef8ff43446a36a6dbb7962f94e5d01307318c87a90a78355b
+AUX blas-atlas-3.9.1-Core2Duo-detect.patch 1030 RMD160 b495f339f1378fd431c9b530790596a158cb463e SHA1 709cb61082ed0a6b6debb41eb2b73969db06a8d8 SHA256 9ed146f14a995ad1122610a3e533136ccb708f149aaecf51ad6e493f301ada49
+AUX blas-atlas-3.9.1-timing.patch 1428 RMD160 52175ec8c7c07a7aa18bd55e6461b92dbead5fcf SHA1 980f70d5318c4d4efb3b534109c9dd3ab41789e4 SHA256 bdd60b7445c17fb4dbfd8f21651e303ff3a828353a9abe65ddb02812a08996ba
 AUX blas.pc.in 301 RMD160 e82627c38aa09c8eb2581a4dd8a38c1670ed6098 SHA1 e8c80353ba72bee2848767b70f7575b723b84f15 SHA256 cb993e61b03514c4c69fac43540e45e759cf57635e2a8d6900118543d06ff433
 AUX c-ATLAS 497 RMD160 1bca887c53b7132f434a8e6e023721a7a7d6e567 SHA1 8dc57e828646aaa1d2de089a187c7b69973bd9b4 SHA256 4d135a53bf4bce2a373f2154286876bbba5a78ccab48834e3db3a83714f224c8
 AUX c-threaded-ATLAS 563 RMD160 410a2f15c4d0c210df778ef53cd15c2400b6a3d7 SHA1 b1e8b5cc85173cd2f5131836897f8b91b2b19e40 SHA256 d3334c1f222589c0ca7794576819b0d9c791d3c37ffac61a2270cb06aa3a8229
@@ -36,6 +38,6 @@ EBUILD blas-atlas-3.7.11-r1.ebuild 5680 RMD160 66aea21ca1e39e2286f037a6f3471fa8d
 EBUILD blas-atlas-3.7.11.ebuild 5048 RMD160 c286cdd38ee471c6243495f78df23df1e835d1f0 SHA1 b45489f4818aa09fd63d355bc3ae18dd6fce3938 SHA256 460202e681da98b1d76fb2a64abbc6a4771e6e05d60ec4fdabb83bbea8643422
 EBUILD blas-atlas-3.8.0.ebuild 6843 RMD160 1e105707051e2653aa7bd941f1f1192acda207f7 SHA1 ab4c92fdb97a9a46946948c0ca6287c8ad27a014 SHA256 fcabb010ad4c78711dd6ebaa932be315071ce465657106ee4cc122e14977672e
 EBUILD blas-atlas-3.8.2.ebuild 6684 RMD160 1ed4af049074291479e2fcc50b9f522e94e97514 SHA1 a90f8ca025a262489e3e4f9827ae295c306f97b3 SHA256 860ea917bd58d7279011f6c87c62c188ba1b029cba4b3b9dbe40e84010c6484a
-EBUILD blas-atlas-3.9.1.ebuild 6963 RMD160 777108832a5c75866ab23a82c2373fbf859e753b SHA1 87e5342b5fd55afb02ba6b01a9e8135a95c848b4 SHA256 0b6f7f193d558c4811213c12b0a05d6aec3bfe323cc9a72d25257ae46f0b903f
-MISC ChangeLog 17207 RMD160 6c9be75408a6872dfd3fc04bd2c0142f482d9c7f SHA1 21bb2e82946c738f3b0850cac6f618dde8e7c82c SHA256 01aadca552c9d12777dc58428f3688f781bd57d171a5183730f75e6a40e6cf5b
+EBUILD blas-atlas-3.9.1.ebuild 7052 RMD160 1e1440d18eec5204aad0398f8e985d7254792a8e SHA1 cbf97f5783612d7ad28b3f210e94913fa93d3809 SHA256 68130b6eabeda85846d5148af6a01e0e05356fd89ab7858bc8fe27d9fde9dd2c
+MISC ChangeLog 17495 RMD160 3499831368303f43ee1b8672e0a1bfc965223d4b SHA1 a4d3f73477f756f958953db3b32b76977df6167f SHA256 469cb2deed8d5dbadd01497161c38a5a2756a9c8128414c73f29728adcc452ed
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.1.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.1.ebuild
index 4fbd74027fdf..d0827ebe26bd 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.9.1.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.9.1.ebuild,v 1.1 2008/07/23 14:43:51 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.1.ebuild,v 1.2 2008/08/03 17:54:18 markusle Exp $
 
 inherit eutils toolchain-funcs fortran multilib
 
@@ -60,6 +60,8 @@ src_unpack() {
 	epatch "${DISTDIR}"/${MY_PN}-${PATCH_V}-shared-libs.patch.bz2
 	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
 	epatch "${FILESDIR}"/${MY_PN}-${PATCH_V}-decl-fix.patch
+	epatch "${FILESDIR}"/${P}-Core2Duo-detect.patch
+	epatch "${FILESDIR}"/${P}-timing.patch
 
 	BLD_DIR="${S}"/gentoo-build
 	mkdir "${BLD_DIR}" || die "failed to generate build directory"
diff --git a/sci-libs/blas-atlas/files/blas-atlas-3.9.1-Core2Duo-detect.patch b/sci-libs/blas-atlas/files/blas-atlas-3.9.1-Core2Duo-detect.patch
new file mode 100644
index 000000000000..ab3ccd6ce990
--- /dev/null
+++ b/sci-libs/blas-atlas/files/blas-atlas-3.9.1-Core2Duo-detect.patch
@@ -0,0 +1,26 @@
+diff -Naur ATLAS/CONFIG/src/backend/archinfo_x86.c ATLAS.new/CONFIG/src/backend/archinfo_x86.c
+--- ATLAS/CONFIG/src/backend/archinfo_x86.c	2008-07-22 10:32:34.000000000 -0400
++++ ATLAS.new/CONFIG/src/backend/archinfo_x86.c	2008-08-02 07:17:09.000000000 -0400
+@@ -92,11 +92,11 @@
+  */
+    do_cpuid(r, 1);
+    *family = (r[EAX] >> 8) & 0xf;      /* base family in bits 11-8 */
+-   if (*family == 0xf || *family == 0) /* extended family is added in */
++/*   if (*family == 0xf || *family == 0) */ /* extended family is added in */
+        *family += ((r[EAX] >> 20) & 0xff);
+ 
+    *model = (r[0] >> 4) & 0xf;         /* model in bits 7-4 */
+-   if (*model == 0xf)                  /* extended model is concatenated */
++ /*  if (*model == 0xf)        */          /* extended model is concatenated */
+       *model |= ((r[0] >> 12) & 0xf0);
+ 
+ /*
+@@ -294,7 +294,7 @@
+       case 14:
+          iret = IntCoreDuo;
+          break;
+-      case 15:
++      case 15: ; case 23:
+          iret = IntCore2Duo;
+          break;
+       default:
diff --git a/sci-libs/blas-atlas/files/blas-atlas-3.9.1-timing.patch b/sci-libs/blas-atlas/files/blas-atlas-3.9.1-timing.patch
new file mode 100644
index 000000000000..5bbecfc7c696
--- /dev/null
+++ b/sci-libs/blas-atlas/files/blas-atlas-3.9.1-timing.patch
@@ -0,0 +1,45 @@
+diff -Naur ATLAS/makes/Make.l1tune ATLAS.new/makes/Make.l1tune
+--- ATLAS/makes/Make.l1tune	2008-07-22 10:32:34.000000000 -0400
++++ ATLAS.new/makes/Make.l1tune	2008-08-02 07:17:40.000000000 -0400
+@@ -46,7 +46,7 @@
+ 
+ force_build :
+ auxlib :
+-	cd $(AUXdir) ; make lib
++#	cd $(AUXdir) ; make lib
+ $(BINdir)/xsubstr:
+ 	cd $(BINdir) ; $(MAKE) xsubstr
+ cdotc.dsc : $(mySRCdir)/DOT/ccasesc.dsc $(BINdir)/xsubstr
+diff -Naur ATLAS/tune/blas/level1/dottime.c ATLAS.new/tune/blas/level1/dottime.c
+--- ATLAS/tune/blas/level1/dottime.c	2008-07-22 10:33:17.000000000 -0400
++++ ATLAS.new/tune/blas/level1/dottime.c	2008-08-02 07:20:23.000000000 -0400
+@@ -198,6 +198,7 @@
+    #define TEST_DOT ATL_DOT
+ #endif
+ 
++#if 0
+ double DoOneTiming(int N, int nkflop, int cachesize, int incX, int incY)
+ /*
+  * This method of timing can be used when we have a cycle-accurate timer
+@@ -253,6 +254,8 @@
+    FA_free(Y, FAy, MAy);
+    return(t1-t0);
+ }
++#endif
++
+ double DoTiming(int N, int nkflop, int cachesize, int incX, int incY)
+ {
+    #ifdef TREAL
+@@ -322,9 +325,9 @@
+    int i;
+    for (i=0; i < nrep; i++)
+    {
+-      if (nkflop <= 0)
+-         tims[i] = DoOneTiming(N, nkflop, cachesize, incX, incY);
+-      else
++   //   if (nkflop <= 0)
++   //      tims[i] = DoOneTiming(N, nkflop, cachesize, incX, incY);
++   //   else
+       tims[i] = DoTiming(N, nkflop, cachesize, incX, incY);
+       fprintf(stdout, "      N=%d, tim=%e\n", N, tims[i]);
+    }