summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2007-04-24 01:42:02 +0000
committerMarkus Dittrich <markusle@gentoo.org>2007-04-24 01:42:02 +0000
commit87b464cb95e76e82b0926b0b73b53f25aab82d41 (patch)
tree4ad615f9ee3c52a197eeeaf8c40cfd1e00c760a4 /sci-libs
parentChange the version order so that backtrplacking doesn't need to happen. (diff)
downloadgentoo-2-87b464cb95e76e82b0926b0b73b53f25aab82d41.tar.gz
gentoo-2-87b464cb95e76e82b0926b0b73b53f25aab82d41.tar.bz2
gentoo-2-87b464cb95e76e82b0926b0b73b53f25aab82d41.zip
Patch to fix macro errors on ppc (fixes bug 172583 and 173675).
(Portage version: 2.1.2.4)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/blas-atlas/ChangeLog6
-rw-r--r--sci-libs/blas-atlas/blas-atlas-3.7.30.ebuild3
-rw-r--r--sci-libs/blas-atlas/files/gnuc_default_fix.patch12
3 files changed, 19 insertions, 2 deletions
diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index e06aa73ffece..89eb7f6af203 100644
--- 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/blas-atlas-3.7.30.ebuild b/sci-libs/blas-atlas/blas-atlas-3.7.30.ebuild
index 1e36e790b34b..646dcc65b2d2 100644
--- 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
index 000000000000..d0e47f7b0f16
--- /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