diff options
| author | Nick Forrington <nick.forrington@gmail.com> | 2018-06-22 18:19:03 -0400 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-06-22 17:19:03 -0500 |
| commit | 259b1834f1c693e7c7a3bfea97e29cd1071fcec0 (patch) | |
| tree | 1ffb1364dae88f0634fc4320a10f6962d94a047a /var | |
| parent | ae8645e27d86666815c48397007df5376c7d929b (diff) | |
| download | spack-259b1834f1c693e7c7a3bfea97e29cd1071fcec0.tar.gz spack-259b1834f1c693e7c7a3bfea97e29cd1071fcec0.tar.bz2 spack-259b1834f1c693e7c7a3bfea97e29cd1071fcec0.tar.xz spack-259b1834f1c693e7c7a3bfea97e29cd1071fcec0.zip | |
silo: Make silo use AutotoolsPackage (#8551)
To benefit from updates to config.guess for newer architectures.
More info: https://github.com/spack/spack/issues/2063
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/silo/package.py | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index e9261822f0..d236a661f2 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -25,7 +25,7 @@ from spack import * -class Silo(Package): +class Silo(AutotoolsPackage): """Silo is a library for reading and writing a wide variety of scientific data to binary, disk files.""" @@ -58,8 +58,14 @@ class Silo(Package): flags.append('-ldl') return (flags, None, None) - def install(self, spec, prefix): + def configure_args(self): + spec = self.spec config_args = [ + '--with-hdf5=%s,%s' % (spec['hdf5'].prefix.include, + spec['hdf5'].prefix.lib), + '--with-zlib=%s,%s' % (spec['zlib'].prefix.include, + spec['zlib'].prefix.lib), + '--enable-install-lite-headers', '--enable-fortran' if '+fortran' in spec else '--disable-fortran', '--enable-silex' if '+silex' in spec else '--disable-silex', '--enable-shared' if '+shared' in spec else '--disable-shared', @@ -79,14 +85,4 @@ class Silo(Package): config_args.append('CXX=%s' % spec['mpi'].mpicxx) config_args.append('FC=%s' % spec['mpi'].mpifc) - configure( - '--prefix=%s' % prefix, - '--with-hdf5=%s,%s' % (spec['hdf5'].prefix.include, - spec['hdf5'].prefix.lib), - '--with-zlib=%s,%s' % (spec['zlib'].prefix.include, - spec['zlib'].prefix.lib), - '--enable-install-lite-headers', - *config_args) - - make() - make('install') + return config_args |