diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-04-04 23:09:08 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-04-04 23:09:08 -0700 |
| commit | c010a6f8b0fbecc267db0b1aebdfeeaa95b97fdc (patch) | |
| tree | 5b7b0cda60864cd686d7ccce9a343dffaf642055 /var | |
| parent | 0296f96c7b5279b2dd9cf585a493f21e3344fe2b (diff) | |
| parent | badf5b047b5cca851c3cad14b4cb7167103ed229 (diff) | |
| download | spack-c010a6f8b0fbecc267db0b1aebdfeeaa95b97fdc.tar.gz spack-c010a6f8b0fbecc267db0b1aebdfeeaa95b97fdc.tar.bz2 spack-c010a6f8b0fbecc267db0b1aebdfeeaa95b97fdc.tar.xz spack-c010a6f8b0fbecc267db0b1aebdfeeaa95b97fdc.zip | |
Merge pull request #728 from eschnett/eschnett/hdf5-1.10
Update HDF5 to 1.10.0
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/hdf5/package.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 513a38ee8a..f26e225b83 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -37,6 +37,7 @@ class Hdf5(Package): list_url = "http://www.hdfgroup.org/ftp/HDF5/releases" list_depth = 3 + version('1.10.0', 'bdc935337ee8282579cd6bc4270ad199') version('1.8.16', 'b8ed9a36ae142317f88b0c7ef4b9c618') version('1.8.15', '03cccb5b33dbe975fdcd8ae9dc021f24') version('1.8.13', 'c03426e9e77d7766944654280b467289') @@ -80,10 +81,16 @@ class Hdf5(Package): # 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') + if spec.satisfies('@1.10:'): + if '+debug' in spec: + extra_args.append('--enable-build-mode=debug') + else: + extra_args.append('--enable-build-mode=production') else: - extra_args.append('--enable-production') + if '+debug' in spec: + extra_args.append('--enable-debug=all') + else: + extra_args.append('--enable-production') if '+shared' in spec: extra_args.append('--enable-shared') @@ -139,5 +146,7 @@ class Hdf5(Package): return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + v + ".tar.gz" elif version < Version("1.7"): return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + version.up_to(2) + "/hdf5-" + v + ".tar.gz" - else: + elif version < Version("1.10"): return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + v + "/src/hdf5-" + v + ".tar.gz" + else: + return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + version.up_to(2) + "/hdf5-" + v + "/src/hdf5-" + v + ".tar.gz" |