3 files changed, 96 insertions, 20 deletions
diff --git a/var/spack/packages/atlas/package.py b/var/spack/packages/atlas/package.py
new file mode 100644
index 0000000000..7ee85f7f16
--- /dev/null
+++ b/var/spack/packages/atlas/package.py
@@ -0,0 +1,28 @@
+from spack import *
+from spack.util.executable import Executable
+import os
+
+class Atlas(Package):
+    """
+    Automatically Tuned Linear Algebra Software, generic shared
+    ATLAS is an approach for the automatic generation and optimization of
+    numerical software. Currently ATLAS supplies optimized versions for the
+    complete set of linear algebra kernels known as the Basic Linear Algebra
+    Subroutines (BLAS), and a subset of the linear algebra routines in the
+    LAPACK library.
+    """
+    homepage = "http://math-atlas.sourceforge.net/"
+    url      = "http://downloads.sourceforge.net/project/math-atlas/Stable/3.10.2/atlas3.10.2.tar.bz2"
+
+    version('3.10.2', 'a4e21f343dec8f22e7415e339f09f6da')
+
+    def install(self, spec, prefix):
+        with working_dir('ATLAS-Build', create=True):
+            self.module.configure = Executable('../configure')
+            configure("--prefix=%s" % prefix)
+
+            make()
+            make('check')
+            make('ptcheck')
+            make('time')
+            make("install")
diff --git a/var/spack/packages/lapack-atlas/package.py b/var/spack/packages/lapack-atlas/package.py
new file mode 100644
index 0000000000..209b02cb94
--- /dev/null
+++ b/var/spack/packages/lapack-atlas/package.py
@@ -0,0 +1,40 @@
+from spack import *
+from spack.util.executable import Executable
+import os
+import urllib
+
+class LapackAtlas(Package):
+    """
+    Automatically Tuned Linear Algebra Software, generic shared
+    ATLAS is an approach for the automatic generation and optimization of
+    numerical software. Currently ATLAS supplies optimized versions for the
+    complete set of linear algebra kernels known as the Basic Linear Algebra
+    Subroutines (BLAS), and a subset of the linear algebra routines in the
+    LAPACK library.
+    """
+    homepage = "http://math-atlas.sourceforge.net/"
+    url      = "http://downloads.sourceforge.net/project/math-atlas/Stable/3.10.2/atlas3.10.2.tar.bz2"
+
+    version('3.10.2', 'a4e21f343dec8f22e7415e339f09f6da')
+
+    # FIXME: Add dependencies if this package requires them.
+    # depends_on("foo")
+
+    def install(self, spec, prefix):
+        #os.mkdir('ATLAS-Build')
+        #os.chdir('ATLAS-Build')
+        with working_dir('ATLAS-Build', create=True):
+            self.module.configure = Executable('../configure')
+            lapack_file = 'lapack-3.5.0.tgz'
+            lapack = urllib.URLopener()
+            lapack.retrieve('http://www.netlib.org/lapack/' + lapack_file, lapack_file)
+
+            configure("--prefix=%s" % prefix,
+                      "--shared",
+                      '--with-netlib-lapack-tarfile=%s' % os.getcwd() + '/' + lapack_file)
+
+            make()
+            make('check')
+            make('ptcheck')
+            make('time')
+            make("install")
diff --git a/var/spack/packages/lapack/package.py b/var/spack/packages/lapack/package.py
index 9990b0bf33..7013ba37b4 100644
--- a/var/spack/packages/lapack/package.py
+++ b/var/spack/packages/lapack/package.py
@@ -4,37 +4,45 @@ import glob
 
 class Lapack(Package):
     """
-    Netlib implementation of Lapack. If we end up having more Lapack libraries, we should
-    turn it into a virtual dependency. 
+    LAPACK version 3.X is a comprehensive FORTRAN library that does
+    linear algebra operations including matrix inversions, least
+    squared solutions to linear sets of equations, eigenvector
+    analysis, singular value decomposition, etc. It is a very
+    comprehensive and reputable package that has found extensive
+    use in the scientific community.
     """
     homepage = "http://www.netlib.org/lapack/"
     url      = "http://www.netlib.org/lapack/lapack-3.5.0.tgz"
 
     version('3.5.0', 'b1d3e3e425b2e44a06760ff173104bdf')
+    version('3.4.2', '61bf1a8a4469d4bdb7604f5897179478')
+    version('3.4.1', '44c3869c38c8335c2b9c2a8bb276eb55')
+    version('3.4.0', '02d5706ec03ba885fc246e5fa10d8c70')
+    version('3.3.1', 'd0d533ec9a5b74933c2a1e84eedc58b4')
+
+    # blas is a virtual dependency.
+    depends_on('blas')
 
     # Doesn't always build correctly in parallel
     parallel = False
 
-    # virtual
-    depends_on("blas")
+    @when('^netlib_blas')
+    def get_blas_libs(self):
+        blas = self.spec['netlib_blas']
+        return [join_path(blas.prefix.lib, 'blas.a')]
 
-    def install(self, spec, prefix):
-        # CMake could be used if the build becomes more complex
 
-        symlink('make.inc.example', 'make.inc')
+    @when('^atlas')
+    def get_blas_libs(self):
+        blas = self.spec['atlas']
+        return [join_path(blas.prefix.lib, l)
+                for l in ('libf77blas.a', 'libatlas.a')]
 
-        # Retrieves name of package that satisifies 'blas' virtual dependency
-        blas_name = next(m for m in ('netlib_blas', 'atlas') if m in spec)
-        blas_spec = spec[blas_name]
-        blas_object_path = blas_spec.prefix.lib + '/blas.a'
 
-        # The blas dependency must provide a 'blas.a' - but this is not gauranteed right now
-        # So maybe we should check if it exists first... maybe...
-        make('BLASLIB="%s"' % blas_object_path)
+    def install(self, spec, prefix):
+        blas_libs = ";".join(self.get_blas_libs())
+        cmake(".", '-DBLAS_LIBRARIES=' + blas_libs, *std_cmake_args)
+        make()
+        make("install")
+
 
-        # Manual install since no method provided
-        # Should probably be changed so only one external call is made
-        # Can install be used on a list of files? 
-        mkdirp(prefix.lib)
-        for file in glob.glob('*.a'):
-            install(file, prefix.lib)