Added patch to improve Core2Duo CPU detection.

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

4 files changed, 36 insertions, 4 deletions

diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog
index f0e9b27b1ccb..2297f9419757 100644
--- a/sci-libs/lapack-atlas/ChangeLog
+++ b/sci-libs/lapack-atlas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/lapack-atlas
 # Copyright 2004-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.67 2008/07/23 14:51:30 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.68 2008/08/03 18:16:51 markusle Exp $
+
+  03 Aug 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/blas-atlas-3.9.1-Core2Duo-detect.patch, lapack-atlas-3.9.1.ebuild:
+  Added patch to improve Core2Duo CPU detection.
 
   23 Jul 2008; Markus Dittrich <markusle@gentoo.org> ChangeLog, Manifest:
   Fixed typo in ChangeLog.
diff --git a/sci-libs/lapack-atlas/Manifest b/sci-libs/lapack-atlas/Manifest
index 5dd837116658..959cbc431a65 100644
--- a/sci-libs/lapack-atlas/Manifest
+++ b/sci-libs/lapack-atlas/Manifest
@@ -1,6 +1,7 @@
 AUX 3.7.11-allow-any-gcc-version.patch 841 RMD160 0274d6286be0d35fb4bcc1a3b6e39b4a5179bbfa SHA1 da0157ab5932188865ae5573eb40c2548abdd71a SHA256 9031e6386d5e082be14d7d6e67b38a833893a404193239746e9d94162ccd7c87
 AUX atlas-3.9.0-disable-ilaenv.patch 2863 RMD160 1de71ab88d23a347dca59a461db5d3b2603c91a0 SHA1 129274241892b114fa7eede02db3a7f6c098b1b1 SHA256 24befbc40439af6ac095058b21677cb738d43a3ae31235a209619b9d57840273
 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 eselect.lapack 161 RMD160 22d89925e857f8c9622612a536bff854be604312 SHA1 ee6f175ef69f74ce74e41409df4efc2594ca9d24 SHA256 89c3804539087292d41cd07c61ed4a1b3590ca1f1e1265e6820ec5b6bb0e3292
 AUX eselect.lapack.atlas 221 RMD160 10a38380469d069b7562b1c8f5a11d0ca94c806d SHA1 381462731ef8f618e8c3cd115c3da812b6f7c2ba SHA256 41b00b000df42c14cc483b468b19d586995b4f528544e24e7aba25feab966a64
 AUX f77-ATLAS 408 RMD160 22830b8541398d0eeb3ac3b36df57011f58bce17 SHA1 8fbe4b62568a04efb6a68a77c264986f45fbb5c7 SHA256 75793cb972dc772a6f3c5ac998c9ce35776ecf6e98c7872589aa66a8899de725
@@ -30,6 +31,6 @@ EBUILD lapack-atlas-3.7.11-r1.ebuild 5887 RMD160 20330de70d2595f2d1cee2dc2311238
 EBUILD lapack-atlas-3.7.11.ebuild 5767 RMD160 47bd14c782c0b78101035b4a95e934148e443558 SHA1 6201229f638ca947028c6b8e2217a85b78a19f61 SHA256 caa1e54b58d1001a07b8c9ac151373c10a33f6117bf87f0903fb26188c089627
 EBUILD lapack-atlas-3.8.0.ebuild 5739 RMD160 8bfc9678a3e56918a541b29bf493f5133c2a7594 SHA1 d5c11546fe71fdc14be532e4b4627e5a777dad91 SHA256 a4c4039a7ef400ac3e021104eb2e4ccfc369079999c669f347d7fca6f6cab5b9
 EBUILD lapack-atlas-3.8.2.ebuild 5743 RMD160 2ee04307e7f54f2883b8f00d98d61fb28efa36b1 SHA1 5d0889466c6f9e5b9959b038090fe573ff005f1a SHA256 7a454ca21dee5fdb17297d738900f4087dd4946606e5541a044e49e7650744c5
-EBUILD lapack-atlas-3.9.1.ebuild 6115 RMD160 ba1d05792f8f0081ea507f0d292b486a249e05d6 SHA1 24b7d2256b44135786fd6e74d22c68ebe58d4c9d SHA256 ab4a4039b24b3e8e62f14e39f7d113d28c80d5a25f7cf4bc22a0520cf195cc4c
-MISC ChangeLog 15005 RMD160 8408475a67af42fe0f18a4335e92d8c55d5f3df2 SHA1 d8b3fdbfc3706b6bdecd45a95dd6113ba3f036cf SHA256 35394c6d7877e8a5e479bc485412cd57a41830b3b2e2bd9152e11e6266a1cd27
+EBUILD lapack-atlas-3.9.1.ebuild 6179 RMD160 dd8072df1170bda444121a0db3a15f5430af15af SHA1 067aab44717108fc1735fd6615a2078139d5563c SHA256 697f7e092cb95b78f622598a1957875136095e8e41d8fbf9b38ec3d08d98f92c
+MISC ChangeLog 15184 RMD160 95f7acdd3e38b7a3881d021842ea93c2ca40f26d SHA1 6ddb114f5fc3142b3674e3a8b9e7b67df3792282 SHA256 0cd6a44d0732d7f6acc505404c656953bac59b0fbe835dc58aacd0f686a6b2b4
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
diff --git a/sci-libs/lapack-atlas/files/blas-atlas-3.9.1-Core2Duo-detect.patch b/sci-libs/lapack-atlas/files/blas-atlas-3.9.1-Core2Duo-detect.patch
new file mode 100644
index 000000000000..ab3ccd6ce990
--- /dev/null
+++ b/sci-libs/lapack-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/lapack-atlas/lapack-atlas-3.9.1.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.1.ebuild
index b7780338976d..ea2df90dbd1f 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.9.1.ebuild
+++ b/sci-libs/lapack-atlas/lapack-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/lapack-atlas/lapack-atlas-3.9.1.ebuild,v 1.1 2008/07/23 14:47:07 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.1.ebuild,v 1.2 2008/08/03 18:16:51 markusle Exp $
 
 inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator
 
@@ -46,6 +46,7 @@ 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}-disable-ilaenv.patch
+	epatch "${FILESDIR}"/blas-${MY_PN}-${PV}-Core2Duo-detect.patch
 
 	# make sure the compile picks up the proper includes
 	sed -i \