summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorKelly (KT) Thompson <kgt@lanl.gov>2016-04-06 09:52:09 -0600
committerKelly (KT) Thompson <kgt@lanl.gov>2016-04-06 09:52:09 -0600
commit71e9f1ab8d652e96ed0178a9aaf813a7f89aed35 (patch)
tree07f51a088a7382af55a78cdab36e47f598e5ec01 /var
parent3c8e055ed04c15d6d430da7c5a60759ac91e7b03 (diff)
downloadspack-71e9f1ab8d652e96ed0178a9aaf813a7f89aed35.tar.gz
spack-71e9f1ab8d652e96ed0178a9aaf813a7f89aed35.tar.bz2
spack-71e9f1ab8d652e96ed0178a9aaf813a7f89aed35.tar.xz
spack-71e9f1ab8d652e96ed0178a9aaf813a7f89aed35.zip
+ I am resubmitting this proposed change because it was accidentally
overwritten. These modifications were accepted as PR#741 but somehow I clobbered them when PR#742 was merged. There was some unintentional overlap in my local repository that I didn't straighten out before pushing.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/netlib-lapack/package.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py
index 05436332ac..f70e634347 100644
--- a/var/spack/repos/builtin/packages/netlib-lapack/package.py
+++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py
@@ -34,15 +34,17 @@ class NetlibLapack(Package):
def patch(self):
# Fix cblas CMakeLists.txt -- has wrong case for subdirectory name.
- filter_file('${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/',
- '${CMAKE_CURRENT_SOURCE_DIR}/cmake/', 'CBLAS/CMakeLists.txt', string=True)
-
+ if self.spec.satisfies('@3.6.0:'):
+ filter_file('${CMAKE_CURRENT_SOURCE_DIR}/CMAKE/',
+ '${CMAKE_CURRENT_SOURCE_DIR}/cmake/', 'CBLAS/CMakeLists.txt', string=True)
def install_one(self, spec, prefix, shared):
cmake_args = ['-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if shared else 'OFF'),
- '-DCBLAS=ON', # always build CBLAS
'-DCMAKE_BUILD_TYPE:STRING=%s' % ('Debug' if '+debug' in spec else 'Release'),
'-DLAPACKE:BOOL=%s' % ('ON' if '+lapacke' in spec else 'OFF')]
+ if spec.satisfies('@3.6.0:'):
+ cmake_args.extend(['-DCBLAS=ON']) # always build CBLAS
+
if '+external-blas' in spec:
# TODO : the mechanism to specify the library should be more general,
# TODO : but this allows to have an hook to an external blas
@@ -80,6 +82,3 @@ class NetlibLapack(Package):
if '+shared' in self.spec:
self.spec.blas_shared_lib = join_path(libdir, 'libblas.%s' % dso_suffix)
self.spec.lapack_shared_lib = join_path(libdir, 'liblapack.%s' % dso_suffix)
-
-
-