Synced patch with fixed version from blas-atlas CVS tree to enable compilation on ppc using gcc-4 (see blas-atlas Changelog entry from 05/07/2006). This fixes bug #142294.

Package-Manager: portage-2.1.1_pre3-r5

3 files changed, 33 insertions, 13 deletions

diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog
index 07eb2e61ca73..1bf8ed5575e3 100644
--- a/sci-libs/lapack-atlas/ChangeLog
+++ b/sci-libs/lapack-atlas/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/lapack-atlas
 # Copyright 2004-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.14 2006/07/27 00:18:07 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.15 2006/08/01 00:32:27 markusle Exp $
+
+  31 Jul 2006; Markus Dittrich <markusle@gentoo.org>
+  files/3.7.11-allow-any-gcc-version.patch:
+  Synced patch with fixed version from blas-atlas CVS tree to enable
+  compilation on ppc using gcc-4 (see blas-atlas Changelog entry 
+  from 05/07/2006). Thanks to Matti Bickel <kabel@cat0.de> for
+  pointing this out. This fixes bug #142294. 
 
   26 Jul 2006; Markus Dittrich <markusle@gentoo.org>
   lapack-atlas-3.7.11.ebuild, lapack-atlas-3.7.11-r1.ebuild:
diff --git a/sci-libs/lapack-atlas/Manifest b/sci-libs/lapack-atlas/Manifest
index 23707b8cac6d..a237574fe42d 100644
--- a/sci-libs/lapack-atlas/Manifest
+++ b/sci-libs/lapack-atlas/Manifest
@@ -1,7 +1,7 @@
-AUX 3.7.11-allow-any-gcc-version.patch 554 RMD160 7ae243d7fad6e2ce37cf02c41751dcc57cd9d8d6 SHA1 2fd20c17aa44e037bbd8d93680e987b820da4b5d SHA256 2e43cbe7c4ec50c7f5a499c0cc9bde04260e673fecd7b3c0db1102bf0ed855ae
-MD5 f96a214eb98219c3702fa278f0fe8ec1 files/3.7.11-allow-any-gcc-version.patch 554
-RMD160 7ae243d7fad6e2ce37cf02c41751dcc57cd9d8d6 files/3.7.11-allow-any-gcc-version.patch 554
-SHA256 2e43cbe7c4ec50c7f5a499c0cc9bde04260e673fecd7b3c0db1102bf0ed855ae files/3.7.11-allow-any-gcc-version.patch 554
+AUX 3.7.11-allow-any-gcc-version.patch 841 RMD160 0274d6286be0d35fb4bcc1a3b6e39b4a5179bbfa SHA1 da0157ab5932188865ae5573eb40c2548abdd71a SHA256 9031e6386d5e082be14d7d6e67b38a833893a404193239746e9d94162ccd7c87
+MD5 ba55197b98178c74b13d36833675ca88 files/3.7.11-allow-any-gcc-version.patch 841
+RMD160 0274d6286be0d35fb4bcc1a3b6e39b4a5179bbfa files/3.7.11-allow-any-gcc-version.patch 841
+SHA256 9031e6386d5e082be14d7d6e67b38a833893a404193239746e9d94162ccd7c87 files/3.7.11-allow-any-gcc-version.patch 841
 AUX f77-ATLAS 408 RMD160 22830b8541398d0eeb3ac3b36df57011f58bce17 SHA1 8fbe4b62568a04efb6a68a77c264986f45fbb5c7 SHA256 75793cb972dc772a6f3c5ac998c9ce35776ecf6e98c7872589aa66a8899de725
 MD5 1b77dbffbf246309e6e97c77b64735fd files/f77-ATLAS 408
 RMD160 22830b8541398d0eeb3ac3b36df57011f58bce17 files/f77-ATLAS 408
@@ -41,10 +41,10 @@ EBUILD lapack-atlas-3.7.11.ebuild 6408 RMD160 58ec901131067ef883aee2beefb2a81de4
 MD5 3ccac05f3d288774f197825c896813d1 lapack-atlas-3.7.11.ebuild 6408
 RMD160 58ec901131067ef883aee2beefb2a81de49c666a lapack-atlas-3.7.11.ebuild 6408
 SHA256 386ae1e004e4d29d2a1118fe8687318511c18088b399f0786af486f94bdbe16f lapack-atlas-3.7.11.ebuild 6408
-MISC ChangeLog 4831 RMD160 4c2ef1950557adf65f6542663dd8309e551f77fb SHA1 2a03e870f87be1cc6774c3fdbb4607591383d077 SHA256 19d7274744bd048c33f3ba6a1527d35f14853b6a0aba4f8827fd5967b7f3a055
-MD5 f59a17d72c8c156529e7c7a149442dc0 ChangeLog 4831
-RMD160 4c2ef1950557adf65f6542663dd8309e551f77fb ChangeLog 4831
-SHA256 19d7274744bd048c33f3ba6a1527d35f14853b6a0aba4f8827fd5967b7f3a055 ChangeLog 4831
+MISC ChangeLog 5173 RMD160 258f02c50100cf31760f0639e7f1c581ee363356 SHA1 a4d47bfd7ac5daf7efa4d0c88c414f01ce3d4408 SHA256 1e8a8b526187d3659f9591b8c77bd0faba25b221bf85386550e0d8e926f51c9a
+MD5 fb6c86fb9b693656bc91a2e35a3d9c58 ChangeLog 5173
+RMD160 258f02c50100cf31760f0639e7f1c581ee363356 ChangeLog 5173
+SHA256 1e8a8b526187d3659f9591b8c77bd0faba25b221bf85386550e0d8e926f51c9a ChangeLog 5173
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
diff --git a/sci-libs/lapack-atlas/files/3.7.11-allow-any-gcc-version.patch b/sci-libs/lapack-atlas/files/3.7.11-allow-any-gcc-version.patch
index 6dfd33ab74af..a9690c78f7e5 100644
--- a/sci-libs/lapack-atlas/files/3.7.11-allow-any-gcc-version.patch
+++ b/sci-libs/lapack-atlas/files/3.7.11-allow-any-gcc-version.patch
@@ -1,7 +1,6 @@
-diff -urN ATLAS.orig/config.c ATLAS/config.c
---- ATLAS.orig/config.c	2006-01-16 19:08:16.000000000 -0800
-+++ ATLAS/config.c	2006-01-16 19:27:22.000000000 -0800
-@@ -712,11 +712,6 @@
+--- ATLAS-old/config.c	2005-08-21 08:30:17.000000000 -0500
++++ ATLAS/config.c	2006-05-07 16:36:02.000000000 -0500
+@@ -712,25 +712,12 @@
                 gcc, major, minor, patch);
     if (major == -1)
        iret = 0;
@@ -13,3 +12,17 @@ diff -urN ATLAS.orig/config.c ATLAS/config.c
     else if (mach == IA64Itan || mach == IA64Itan2 || MachIsUS(mach) ||
              mach == Dec21164 || mach == Dec21264)
     {
+       if (major == 3)
+          iret = 1;
+    }
+-/*
+- * Need 3.2 or newer to make altivec work
+- */
+-   else if ((OS == OSLinux || comp != 3) && (mach == PPCG4 || mach == PPCG5))
+-   {
+-      if (major >= 3 && minor >= 3)
+-         iret = 1;
+-   }
+    else iret = 1; /* any gcc is fine, take first in path */
+    return (iret);
+ }