Patch to fix macro errors on ppc (fixes bug 172583 and 173675).

Package-Manager: portage-2.1.2.4

diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index e06aa73ffece0c711ef38e74068b689369e1041e..89eb7f6af20328a2cda9e0038f49c361c253fc8c 100644 (file)
--- a/sci-libs/blas-atlas/ChangeLog
+++ b/sci-libs/blas-atlas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/blas-atlas
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.56 2007/03/27 01:16:32 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.57 2007/04/24 01:42:02 markusle Exp $
+
+  24 Apr 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/gnuc_default_fix.patch, blas-atlas-3.7.30.ebuild:
+  Patch to fix macro errors on ppc (fixes bug 172583 and 173675).
 
 *blas-atlas-3.7.30 (25 Mar 2007)
 

diff --git a/sci-libs/blas-atlas/Manifest b/sci-libs/blas-atlas/Manifest
index 7df29e1b873e62beb1c5352870f4b12dedaa72a7..1d67a74f9057a500f55444a3d191c1567c976a55 100644 (file)
--- a/sci-libs/blas-atlas/Manifest
+++ b/sci-libs/blas-atlas/Manifest
@@ -46,6 +46,10 @@ AUX f77-threaded-ATLAS 493 RMD160 74769a296790d71b5a6305167b47e707d7c329f0 SHA1
 MD5 9e670df5417c95c0de5b04e95d078f24 files/f77-threaded-ATLAS 493
 RMD160 74769a296790d71b5a6305167b47e707d7c329f0 files/f77-threaded-ATLAS 493
 SHA256 939aea739edc4332f7c1e07fbd84f9eea0eba5e6fc63515c8d6c879c71941580 files/f77-threaded-ATLAS 493
+AUX gnuc_default_fix.patch 636 RMD160 6ea5f48ade141ad50613ba59b090b1d9c1d15b3e SHA1 de2c899776d231f3b6ae35cde3327dc67145ef77 SHA256 f1ed432e5eb86560bdd858210f6c470491f5ce0b64deebc2e37b1afd66c591f4
+MD5 834efedaecaafe5d9934466122564f8f files/gnuc_default_fix.patch 636
+RMD160 6ea5f48ade141ad50613ba59b090b1d9c1d15b3e files/gnuc_default_fix.patch 636
+SHA256 f1ed432e5eb86560bdd858210f6c470491f5ce0b64deebc2e37b1afd66c591f4 files/gnuc_default_fix.patch 636
 AUX unbuffered.patch 497 RMD160 c2a04b5243d32ff378ee76323611e7383464e019 SHA1 321bf9254f6df4d0914288583db00e8418b1e121 SHA256 e21636769e6bebbec34c79bc29b9fdf9c5dbe46803f835b44b102e9d7a90b64e
 MD5 e362a664ac2e543545706b85664af921 files/unbuffered.patch 497
 RMD160 c2a04b5243d32ff378ee76323611e7383464e019 files/unbuffered.patch 497
@@ -86,14 +90,14 @@ EBUILD blas-atlas-3.7.24.ebuild 5211 RMD160 c6973a763ee33f8fabd01972ab551b1aab96
 MD5 c30508c24785e31bdba10b14a442401b blas-atlas-3.7.24.ebuild 5211
 RMD160 c6973a763ee33f8fabd01972ab551b1aab9609ae blas-atlas-3.7.24.ebuild 5211
 SHA256 9c5a3285f8be5ce4feaee1700838669f495ded9c56e90aec304d436d2f37c455 blas-atlas-3.7.24.ebuild 5211
-EBUILD blas-atlas-3.7.30.ebuild 5319 RMD160 db0385855f39db182812ff24b38dbeb4977d25eb SHA1 c0a240ff1743feb881f6a9d053e9cedd89f4cba4 SHA256 b50bf4f3c82b0d746d69d6af11c669fc74a3019b2b2f3d3423dd1f02989808b8
-MD5 6521ee8f285d5c49003e03917f227334 blas-atlas-3.7.30.ebuild 5319
-RMD160 db0385855f39db182812ff24b38dbeb4977d25eb blas-atlas-3.7.30.ebuild 5319
-SHA256 b50bf4f3c82b0d746d69d6af11c669fc74a3019b2b2f3d3423dd1f02989808b8 blas-atlas-3.7.30.ebuild 5319
-MISC ChangeLog 12503 RMD160 2fa33d94ad67f3cd09b24c3137bdd4395181c9fc SHA1 545f335341904d6d44b18a0707910b17cad47ae7 SHA256 e8743fbc6f664f5e5e197f1a5331d188fff276fe6f7e5568afb5e242f2845583
-MD5 6c996d3d192e87d584f14eee735333c4 ChangeLog 12503
-RMD160 2fa33d94ad67f3cd09b24c3137bdd4395181c9fc ChangeLog 12503
-SHA256 e8743fbc6f664f5e5e197f1a5331d188fff276fe6f7e5568afb5e242f2845583 ChangeLog 12503
+EBUILD blas-atlas-3.7.30.ebuild 5364 RMD160 d38e45864ea2cd28ef1344cc2c14820689583056 SHA1 f9564ff36650d48447080214a3b1a64bb2ebc9e7 SHA256 e269296986696b722e6988f238dd3432091814dc7114f07d11400c2adf5541ab
+MD5 42f92da9237e992bfde69053b0cf974b blas-atlas-3.7.30.ebuild 5364
+RMD160 d38e45864ea2cd28ef1344cc2c14820689583056 blas-atlas-3.7.30.ebuild 5364
+SHA256 e269296986696b722e6988f238dd3432091814dc7114f07d11400c2adf5541ab blas-atlas-3.7.30.ebuild 5364
+MISC ChangeLog 12682 RMD160 6cbaa2178d5380480da79e1d2fb76ba6bad21437 SHA1 3cc21c0f319f0da7b6052e6610decaba55e5f381 SHA256 10f87b8e59c6ea16d8ececc115c3b7d6881104cc60afb3db37d5734ff42f2bd0
+MD5 23d8121ceb1949058c7466891e408317 ChangeLog 12682
+RMD160 6cbaa2178d5380480da79e1d2fb76ba6bad21437 ChangeLog 12682
+SHA256 10f87b8e59c6ea16d8ececc115c3b7d6881104cc60afb3db37d5734ff42f2bd0 ChangeLog 12682
 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/blas-atlas/blas-atlas-3.7.30.ebuild b/sci-libs/blas-atlas/blas-atlas-3.7.30.ebuild
index 1e36e790b34b0bd29a2601a539ac74248b808c2e..646dcc65b2d2dde7f3998cf7e88bfc0ed96d548f 100644 (file)
--- a/sci-libs/blas-atlas/blas-atlas-3.7.30.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.7.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.30.ebuild,v 1.1 2007/03/27 01:16:32 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.30.ebuild,v 1.2 2007/04/24 01:42:02 markusle Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -53,6 +53,7 @@ src_unpack() {
 
        epatch "${DISTDIR}"/${MY_PN}-3.7.23-shared-libs.patch.bz2
        epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
+       epatch "${FILESDIR}"/gnuc_default_fix.patch
 
        # make sure shared libs link against proper libraries
        if [[ ${FORTRANC} == "gfortran" ]]; then

diff --git a/sci-libs/blas-atlas/files/gnuc_default_fix.patch b/sci-libs/blas-atlas/files/gnuc_default_fix.patch
new file mode 100644 (file)
index 0000000..d0e47f7
--- /dev/null
+++ b/sci-libs/blas-atlas/files/gnuc_default_fix.patch
@@ -0,0 +1,12 @@
+diff -Naur ATLAS.old/include/atlas_prefetch.h ATLAS/include/atlas_prefetch.h
+--- ATLAS.old/include/atlas_prefetch.h 2007-03-25 09:56:56.000000000 -0400
++++ ATLAS/include/atlas_prefetch.h     2007-03-28 18:05:01.000000000 -0400
+@@ -128,7 +128,7 @@
+       #define ATL_pfl1W(mem) ATL_pfavW(mem, 33619968, 2)
+       #define ATL_GOT_L1PREFETCH
+    #endif
+-#elif defined(defined(__GNUC__))  /* last ditch, use gcc predefined func */
++#elif defined(__GNUC__)  /* last ditch, use gcc predefined func */
+    #define ATL_pfl1R(mem) __builtin_prefetch(mem, 0, 3)
+    #define ATL_pfl1W(mem) __builtin_prefetch(mem, 1, 3)
+    #define ATL_GOT_L1PREFETCH