summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-03-09 11:39:06 -0800
committerTodd Gamblin <tgamblin@llnl.gov>2016-03-09 11:39:06 -0800
commitb93a2ba1cf2644256fc7b8295f6ce279853975d7 (patch)
tree35fab7a4ccef1a51be308265ac89ecf7d16d3a91
parente6a34685985d00d039fa195331816763497a8376 (diff)
parentd06ebf23d4ffe3499edca3f34f60be9b561f5f8c (diff)
downloadspack-b93a2ba1cf2644256fc7b8295f6ce279853975d7.tar.gz
spack-b93a2ba1cf2644256fc7b8295f6ce279853975d7.tar.bz2
spack-b93a2ba1cf2644256fc7b8295f6ce279853975d7.tar.xz
spack-b93a2ba1cf2644256fc7b8295f6ce279853975d7.zip
Merge pull request #520 from LLNL/bugfix/remove-hdf5-unsupported-variant
Removing `unsupported` variant from HDF5.
-rw-r--r--var/spack/repos/builtin/packages/hdf5/package.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py
index ed4e7c35c9..513a38ee8a 100644
--- a/var/spack/repos/builtin/packages/hdf5/package.py
+++ b/var/spack/repos/builtin/packages/hdf5/package.py
@@ -46,7 +46,6 @@ class Hdf5(Package):
variant('cxx', default=True, description='Enable C++ support')
variant('fortran', default=True, description='Enable Fortran support')
- variant('unsupported', default=True, description='Enables unsupported configuration options')
variant('mpi', default=False, description='Enable MPI support')
variant('szip', default=False, description='Enable szip support')
@@ -74,6 +73,13 @@ class Hdf5(Package):
self.validate(spec)
# Handle compilation after spec validation
extra_args = []
+
+ # Always enable this option. This does not actually enable any
+ # features: it only *allows* the user to specify certain
+ # combinations of other arguments. Enabling it just skips a
+ # sanity check in configure, so this doesn't merit a variant.
+ extra_args.append("--enable-unsupported")
+
if '+debug' in spec:
extra_args.append('--enable-debug=all')
else:
@@ -84,9 +90,6 @@ class Hdf5(Package):
else:
extra_args.append('--enable-static-exec')
- if '+unsupported' in spec:
- extra_args.append("--enable-unsupported")
-
if '+cxx' in spec:
extra_args.append('--enable-cxx')