diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-04-06 16:01:33 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-04-06 16:01:33 -0700 |
| commit | 25d48f700ccdc318bd27fbbb28fa78e86125f079 (patch) | |
| tree | 68f8060ef3a0a0ff0f8aa71118cfcf38b2317157 | |
| parent | d62766a94de455ea2d406e42e488fb7be8ce0690 (diff) | |
| parent | 71e9f1ab8d652e96ed0178a9aaf813a7f89aed35 (diff) | |
| download | spack-25d48f700ccdc318bd27fbbb28fa78e86125f079.tar.gz spack-25d48f700ccdc318bd27fbbb28fa78e86125f079.tar.bz2 spack-25d48f700ccdc318bd27fbbb28fa78e86125f079.tar.xz spack-25d48f700ccdc318bd27fbbb28fa78e86125f079.zip | |
Merge pull request #752 from KineticTheory/pkg-netlib-lapack
Second attempt at PR#741
| -rw-r--r-- | var/spack/repos/builtin/packages/netlib-lapack/package.py | 13 |
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) - - - |