From b5d734fe44de76d49ffe3cf420c3e0284ede96d3 Mon Sep 17 00:00:00 2001
From: Jaka Kranjc
Date: Thu, 2 Nov 2006 11:08:22 +0100
Subject: atlas: fix #9380 infinite queries and missing dependency

---
 cluster/atlas/BUILD              | 6 +++++-
 cluster/atlas/DEPENDS            | 1 +
 cluster/atlas/DETAILS            | 7 +++++--
 cluster/atlas/HISTORY            | 6 ++++++
 cluster/atlas/atlas-3.6.0.config | 7 -------
 cluster/atlas/atlas-nog77.config | 9 +++++++++
 6 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100755 cluster/atlas/DEPENDS
 delete mode 100644 cluster/atlas/atlas-3.6.0.config
 create mode 100644 cluster/atlas/atlas-nog77.config

(limited to 'cluster/atlas')

diff --git a/cluster/atlas/BUILD b/cluster/atlas/BUILD
index 7976124c63..7d40b47041 100755
--- a/cluster/atlas/BUILD
+++ b/cluster/atlas/BUILD
@@ -1,6 +1,10 @@
 persistent_add  SOURCE_LIB                           &&
 make_single                                          &&
-make < $SCRIPT_DIRECTORY/atlas-${VERSION}.config     &&
+local config=$(<$SCRIPT_DIRECTORY/atlas-nog77.config) &&
+if is_depends_enabled $SPELL fortran; then
+  config=$(sed 's/0$/\ngfortran/' <<< "$config")
+fi &&
+echo "$config" | make      &&
 ARCH=`ls -1 Make.Linux* | sed -e 's/Make.//'`        &&
 make  install  arch=$ARCH                            &&
 SOURCE_LIB=$SOURCE_DIRECTORY/lib/$ARCH
diff --git a/cluster/atlas/DEPENDS b/cluster/atlas/DEPENDS
new file mode 100755
index 0000000000..0497e321c6
--- /dev/null
+++ b/cluster/atlas/DEPENDS
@@ -0,0 +1 @@
+optional_depends fortran "" "" "for fortran bindings"
diff --git a/cluster/atlas/DETAILS b/cluster/atlas/DETAILS
index b51425cb35..67020468ed 100755
--- a/cluster/atlas/DETAILS
+++ b/cluster/atlas/DETAILS
@@ -6,10 +6,13 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/ATLAS
      SOURCE_HASH=sha512:0272f94e4e452d240741336a65450d9767150c886681e3f88bcdbebeb18ceba7d489f848ec2824ef0ce1dd33f8cb122e8d87e64d5f19407d02801b775fce2f73
         WEB_SITE=http://math-atlas.sourceforge.net
          ENTERED=20020514
-         UPDATED=20021014
+      PATCHLEVEL=1
       LICENSE[0]=BSD
         KEYWORDS="algebra cluster"
            SHORT="Automatically Tuned Linear Algebra Software (ATLAS)"
 cat << EOF
-ATLAS (Automatically Tuned Linear Algebra Software) provides highly optimized Linear Algebra kernels for arbitrary cache-based architectures. ATLAS provides ANSI C and Fortran77 interfaces for the entire BLAS API, and a small portion of the LAPACK API.
+ATLAS (Automatically Tuned Linear Algebra Software) provides highly optimized
+Linear Algebra kernels for arbitrary cache-based architectures. ATLAS provides
+ANSI C and Fortran77 interfaces for the entire BLAS API, and a small portion of
+the LAPACK API.
 EOF
diff --git a/cluster/atlas/HISTORY b/cluster/atlas/HISTORY
index 23f3c76ec6..e1dd6ce087 100644
--- a/cluster/atlas/HISTORY
+++ b/cluster/atlas/HISTORY
@@ -1,3 +1,9 @@
+2006-11-01 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* DEPENDS: add optional fortran
+	* BUILD: add fortran when requested and fix #9380
+	* atlas-nog77.config: renamed; make doesn't like <, part of #9380
+	* DETAILS: ++PATCHLEVEL
+
 2006-06-28 Eric Sandall <eric@sandall.us>
 	* DETAILS: Removed BUILD_API=2, set grimoire-wide
 
diff --git a/cluster/atlas/atlas-3.6.0.config b/cluster/atlas/atlas-3.6.0.config
deleted file mode 100644
index efdac285a5..0000000000
--- a/cluster/atlas/atlas-3.6.0.config
+++ /dev/null
@@ -1,7 +0,0 @@
-025
-y
-y
-y
-
-0
-y
diff --git a/cluster/atlas/atlas-nog77.config b/cluster/atlas/atlas-nog77.config
new file mode 100644
index 0000000000..8b96497e5c
--- /dev/null
+++ b/cluster/atlas/atlas-nog77.config
@@ -0,0 +1,9 @@
+025
+y
+y
+n
+y
+
+
+0
+
-- 
cgit v1.2.3