summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Bienstman <pbienst@gentoo.org>2005-09-10 08:29:11 +0000
committerPeter Bienstman <pbienst@gentoo.org>2005-09-10 08:29:11 +0000
commitb6770dc723715f9270b56ebe3abb95bbdf6c6b67 (patch)
tree828d67504dc6dd4f957ace83be6e9777c0947d76 /sci-libs/blas-atlas
parentadded support for ftp daemons, added mips arch (diff)
downloadgentoo-2-b6770dc723715f9270b56ebe3abb95bbdf6c6b67.tar.gz
gentoo-2-b6770dc723715f9270b56ebe3abb95bbdf6c6b67.tar.bz2
gentoo-2-b6770dc723715f9270b56ebe3abb95bbdf6c6b67.zip
Fix #102088.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'sci-libs/blas-atlas')
-rw-r--r--sci-libs/blas-atlas/ChangeLog6
-rw-r--r--sci-libs/blas-atlas/Manifest15
-rw-r--r--sci-libs/blas-atlas/blas-atlas-3.6.0.ebuild4
-rw-r--r--sci-libs/blas-atlas/blas-atlas-3.7.10.ebuild3
-rw-r--r--sci-libs/blas-atlas/files/unbuffered.patch16
5 files changed, 29 insertions, 15 deletions
diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index 81e7ebcd22d7..f3b883dcbff7 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.6 2005/06/13 14:13:57 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.7 2005/09/10 08:29:11 pbienst Exp $
+
+ 10 Sep 2005; Peter Bienstman <pbienst@gentoo.org> +files/unbuffered.patch,
+ blas-atlas-3.6.0.ebuild, blas-atlas-3.7.10.ebuild:
+ Fix #102088.
13 Jun 2005; Danny van Dyk <kugelfang@gentoo.org>
blas-atlas-3.7.10.ebuild:
diff --git a/sci-libs/blas-atlas/Manifest b/sci-libs/blas-atlas/Manifest
index 0484d9b359f0..1095ef382738 100644
--- a/sci-libs/blas-atlas/Manifest
+++ b/sci-libs/blas-atlas/Manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d3f9840c74e78f05c11a81d70309edf3 blas-atlas-3.6.0.ebuild 4158
-MD5 1be555007ff82cfcc2cbd01f2e929968 blas-atlas-3.7.10.ebuild 4072
+MD5 db664578b79cae7f2f8ebd5ab4d507f3 blas-atlas-3.6.0.ebuild 4196
+MD5 a74fd8b6cb03333b1b898bfc3bedd542 blas-atlas-3.7.10.ebuild 4109
MD5 381c8eea572fb91729b3fbaad72ecc90 ChangeLog 3889
MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
MD5 13d26350d75e6993f1b3ec48ca97f14e files/war 545
@@ -11,11 +8,5 @@ MD5 646c8df3efa24d6573a870dbb0f5fc8d files/f77-ATLAS 457
MD5 869c65bd1672b6bea4f03520e7e1cdf9 files/c-threaded-ATLAS 563
MD5 c0a79db6ec6fb95a56ce677107f08c01 files/f77-threaded-ATLAS 492
MD5 e092f2baac7a6c4e34591acb77552017 files/digest-blas-atlas-3.7.10 140
+MD5 e362a664ac2e543545706b85664af921 files/unbuffered.patch 497
MD5 c1c57e922c1763ddde357504442e94c4 files/digest-blas-atlas-3.6.0 139
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCrae+I1lqEGTUzyQRAu5LAKDUtqk2yq8RJtdSIDBwaNfRry3s/gCfSDwq
-nuqI2V0P3YbxfxAZ4Z+X/F8=
-=5xTz
------END PGP SIGNATURE-----
diff --git a/sci-libs/blas-atlas/blas-atlas-3.6.0.ebuild b/sci-libs/blas-atlas/blas-atlas-3.6.0.ebuild
index 94cc3c00659c..aacdf5e85ed2 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.6.0.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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.6.0.ebuild,v 1.3 2005/03/02 17:41:37 pbienst Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.6.0.ebuild,v 1.4 2005/09/10 08:29:11 pbienst Exp $
inherit eutils toolchain-funcs
@@ -36,6 +36,8 @@ src_unpack() {
unpack ${A}
cd ${S}
+
+ epatch ${FILESDIR}/unbuffered.patch
epatch ${DISTDIR}/atlas3.6.0-shared-libs.patch.bz2
sed -i -e "s:ASM:ASM VOLATILE:" include/contrib/camm_dpa.h || die "sed failed to fix clobbering"
cp ${FILESDIR}/war ${S}
diff --git a/sci-libs/blas-atlas/blas-atlas-3.7.10.ebuild b/sci-libs/blas-atlas/blas-atlas-3.7.10.ebuild
index f3e973f6f917..2ad34047255c 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.7.10.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.7.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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.10.ebuild,v 1.3 2005/06/13 15:35:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.10.ebuild,v 1.4 2005/09/10 08:29:11 pbienst Exp $
inherit eutils toolchain-funcs fortran
@@ -27,6 +27,7 @@ src_unpack() {
unpack ${A}
cd ${S}
+ epatch ${FILESDIR}/unbuffered.patch
epatch ${DISTDIR}/atlas3.6.0-shared-libs.patch.bz2
sed -i \
-e "s:ASM:ASM VOLATILE:" \
diff --git a/sci-libs/blas-atlas/files/unbuffered.patch b/sci-libs/blas-atlas/files/unbuffered.patch
new file mode 100644
index 000000000000..893680ac220f
--- /dev/null
+++ b/sci-libs/blas-atlas/files/unbuffered.patch
@@ -0,0 +1,16 @@
+*** ATLAS/config.c Mon Dec 22 15:06:32 2003
+--- ATLAS_modif/config.c Fri Sep 9 19:45:37 2005
+***************
+*** 4364,4369 ****
+--- 4364,4374 ----
+ char UCDEF[256];
+ enum MACHTYPE mach;
+
++ /* Workaround for occasional hanging during emerge.*/
++
++ setbuf(stdout, 0);
++ setbuf(stdin, 0);
++
+ flag = GetFlags(nargs, args, &mach, &ncpu, UCDEF, TOPdir, ARCH, blaslib,
+ CC, CCFLAGS, F77, F77FLAGS, MCC, MMFLAGS, GOODGCC,
+ XCC, XCCFLAGS);