summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/exodusii/package.py2
-rw-r--r--var/spack/repos/builtin/packages/hdf5/package.py7
2 files changed, 5 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/exodusii/package.py b/var/spack/repos/builtin/packages/exodusii/package.py
index d68baaa6d9..af258b7e6e 100644
--- a/var/spack/repos/builtin/packages/exodusii/package.py
+++ b/var/spack/repos/builtin/packages/exodusii/package.py
@@ -23,7 +23,7 @@ class Exodusii(Package):
# TODO: Make this a build dependency once build dependencies are supported
# (see: https://github.com/LLNL/spack/pull/378).
depends_on('cmake@2.8.7:')
- depends_on('hdf5+shared~mpi')
+ depends_on('hdf5~shared~mpi')
depends_on('netcdf~mpi')
patch('exodus-cmake.patch')
diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py
index f4de92aa83..ed4e7c35c9 100644
--- a/var/spack/repos/builtin/packages/hdf5/package.py
+++ b/var/spack/repos/builtin/packages/hdf5/package.py
@@ -42,7 +42,7 @@ class Hdf5(Package):
version('1.8.13', 'c03426e9e77d7766944654280b467289')
variant('debug', default=False, description='Builds a debug version of the library')
- variant('shared', default=False, description='Builds a static executable version of the library')
+ variant('shared', default=True, description='Builds a shared version of the library')
variant('cxx', default=True, description='Enable C++ support')
variant('fortran', default=True, description='Enable Fortran support')
@@ -79,7 +79,9 @@ class Hdf5(Package):
else:
extra_args.append('--enable-production')
- if '+static' in spec:
+ if '+shared' in spec:
+ extra_args.append('--enable-shared')
+ else:
extra_args.append('--enable-static-exec')
if '+unsupported' in spec:
@@ -123,7 +125,6 @@ class Hdf5(Package):
configure(
"--prefix=%s" % prefix,
"--with-zlib=%s" % spec['zlib'].prefix,
- "--enable-shared", # TODO : this should be enabled by default, remove it?
*extra_args)
make()
make("install")