CBLAS package working and patching in spack compilers.

1 files changed, 21 insertions, 11 deletions

diff --git a/var/spack/packages/cblas/package.py b/var/spack/packages/cblas/package.py
index 81dac667d1..93cf5fb7b8 100644
--- a/var/spack/packages/cblas/package.py
+++ b/var/spack/packages/cblas/package.py
@@ -2,21 +2,31 @@ from spack import *
 import os
 
 class Cblas(Package):
-    """The BLAS (Basic Linear Algebra Subprograms) are routines that provide standard 
-    building blocks for performing basic vector and matrix operations."""
+    """The BLAS (Basic Linear Algebra Subprograms) are routines that
+       provide standard building blocks for performing basic vector and
+       matrix operations."""
 
     homepage = "http://www.netlib.org/blas/_cblas/"
 
-    version('unversioned', '1e8830f622d2112239a4a8a83b84209a', 
-        url='http://www.netlib.org/blas/blast-forum/cblas.tgz')
+    # tarball has no version, but on the date below, this MD5 was correct.
+    version('2015-06-06', '1e8830f622d2112239a4a8a83b84209a',
+            url='http://www.netlib.org/blas/blast-forum/cblas.tgz')
 
     depends_on('blas')
     parallel = False
 
-    def install(self, spec, prefix):    
-        filter_file('BLLIB = /Users/julie/Documents/Boulot/lapack-dev/lapack/trunk/blas_LINUX.a', 'BLLIB = %s/libblas.a' % spec['blas'].prefix.lib, './Makefile.in', string=True)
-        
-        make('all') # Compile.
-        mkdirp('%s' % prefix.lib) # Create the lib dir inside the install dir.
-        move('./lib/cblas_LINUX.a', '%s/libcblas.a' % prefix.lib) # Rename the generated lib file to libcblas.a
-        
+    def patch(self):
+        mf = FileFilter('Makefile.in')
+
+        mf.filter('^BLLIB =.*', 'BLLIB = %s/libblas.a' % self.spec['blas'].prefix.lib)
+        mf.filter('^CC =.*', 'CC = cc')
+        mf.filter('^FC =.*', 'FC = f90')
+
+
+    def install(self, spec, prefix):
+        make('all')
+        mkdirp(prefix.lib)
+
+        # Rename the generated lib file to libcblas.a
+        install('./lib/cblas_LINUX.a', '%s/libcblas.a' % prefix.lib)
+