diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-07-20 12:56:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 12:56:41 -0700 |
| commit | 4c7c9f4ff5f99f22c2603e1b47b8c892376721da (patch) | |
| tree | 3805e18351548bbfaa6b3b0ad6c3a572688e9cd8 | |
| parent | cd4f429f7264c3a0a0cb9da69a1ae745c504bcec (diff) | |
| parent | 8034536054b4fcd94809bde379ecc5e2d6a61647 (diff) | |
| download | spack-4c7c9f4ff5f99f22c2603e1b47b8c892376721da.tar.gz spack-4c7c9f4ff5f99f22c2603e1b47b8c892376721da.tar.bz2 spack-4c7c9f4ff5f99f22c2603e1b47b8c892376721da.tar.xz spack-4c7c9f4ff5f99f22c2603e1b47b8c892376721da.zip | |
Merge pull request #1303 from adamjstewart/features/armadillo
Updates to Armadillo package
| -rw-r--r-- | var/spack/repos/builtin/packages/armadillo/package.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/armadillo/package.py b/var/spack/repos/builtin/packages/armadillo/package.py index b3e5994e30..4356f60aca 100644 --- a/var/spack/repos/builtin/packages/armadillo/package.py +++ b/var/spack/repos/builtin/packages/armadillo/package.py @@ -33,11 +33,13 @@ class Armadillo(Package): homepage = "http://arma.sourceforge.net/" url = "http://sourceforge.net/projects/arma/files/armadillo-7.200.1.tar.xz" + version('7.200.2', 'b21585372d67a8876117fd515d8cf0a2') version('7.200.1', 'ed86d6df0058979e107502e1fe3e469e') variant('hdf5', default=False, description='Include HDF5 support') - depends_on('arpack') + depends_on('cmake@2.8:', type='build') + depends_on('arpack-ng') # old arpack causes undefined symbols depends_on('blas') depends_on('lapack') depends_on('superlu@5.2:') @@ -46,8 +48,8 @@ class Armadillo(Package): def install(self, spec, prefix): cmake_args = [ # ARPACK support - '-DARPACK_LIBRARY={0}/libarpack.a'.format( - spec['arpack'].prefix.lib), + '-DARPACK_LIBRARY={0}/libarpack.{1}'.format( + spec['arpack-ng'].prefix.lib, dso_suffix), # BLAS support '-DBLAS_LIBRARY={0}'.format(spec['blas'].blas_shared_lib), # LAPACK support |