diff options
| author | eugeneswalker <38933153+eugeneswalker@users.noreply.github.com> | 2021-03-09 15:11:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-09 15:11:49 -0800 |
| commit | 1492461b8e4920d09c9f67af204cc90b24edce47 (patch) | |
| tree | 75310942f0c70db10d7abaca5387ad7d3adfde6f | |
| parent | 3006da819737c2e3560b64cf9d7ac25e6df67c6f (diff) | |
| download | spack-1492461b8e4920d09c9f67af204cc90b24edce47.tar.gz spack-1492461b8e4920d09c9f67af204cc90b24edce47.tar.bz2 spack-1492461b8e4920d09c9f67af204cc90b24edce47.tar.xz spack-1492461b8e4920d09c9f67af204cc90b24edce47.zip | |
netcdf-c@4.7.3:4.7.4 patch detection of pnetcdf for spectrum-mpi (#22180)
| -rw-r--r-- | var/spack/repos/builtin/packages/netcdf-c/4.7.3-spectrum-mpi-pnetcdf-detect.patch | 44 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/netcdf-c/package.py | 3 |
2 files changed, 47 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/netcdf-c/4.7.3-spectrum-mpi-pnetcdf-detect.patch b/var/spack/repos/builtin/packages/netcdf-c/4.7.3-spectrum-mpi-pnetcdf-detect.patch new file mode 100644 index 0000000000..0e04164ff6 --- /dev/null +++ b/var/spack/repos/builtin/packages/netcdf-c/4.7.3-spectrum-mpi-pnetcdf-detect.patch @@ -0,0 +1,44 @@ +--- a/configure 2019-11-20 18:59:25.000000000 -0500 ++++ b/configure 13:20:48.088873402 -0500 +@@ -18459,12 +18459,12 @@ + $as_echo_n "checking Is libpnetcdf version 1.6.0 or later?... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++#include <pnetcdf.h> + + int + main () + { + +-#include <pnetcdf.h> + #if (PNETCDF_VERSION_MAJOR*1000 + PNETCDF_VERSION_MINOR < 1006) + choke me + #endif +@@ -18584,12 +18584,12 @@ + $as_echo_n "checking if erange-fill is enabled in PnetCDF... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++#include <pnetcdf.h> + + int + main () + { + +-#include <pnetcdf.h> + #if !defined(PNETCDF_ERANGE_FILL) || PNETCDF_ERANGE_FILL == 0 + choke me + #endif +@@ -18619,12 +18619,12 @@ + $as_echo_n "checking if relax-coord-bound is enabled in PnetCDF... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ ++#include <pnetcdf.h> + + int + main () + { + +-#include <pnetcdf.h> + #if !defined(PNETCDF_RELAX_COORD_BOUND) || PNETCDF_RELAX_COORD_BOUND == 0 + choke me + #endif diff --git a/var/spack/repos/builtin/packages/netcdf-c/package.py b/var/spack/repos/builtin/packages/netcdf-c/package.py index 63e6617bd6..16d177890c 100644 --- a/var/spack/repos/builtin/packages/netcdf-c/package.py +++ b/var/spack/repos/builtin/packages/netcdf-c/package.py @@ -53,6 +53,9 @@ class NetcdfC(AutotoolsPackage): patch('https://github.com/Unidata/netcdf-c/pull/1505.patch', sha256='f52db13c61b9c19aafe03c2a865163b540e9f6dee36e3a5f808f05fac59f2030', when='@4.7.2') patch('https://github.com/Unidata/netcdf-c/pull/1508.patch', sha256='56532470875b9a97f3cf2a7d9ed16ef1612df3265ee38880c109428322ff3a40', when='@4.7.2') + # See https://github.com/Unidata/netcdf-c/pull/1752 + patch('4.7.3-spectrum-mpi-pnetcdf-detect.patch', when='@4.7.3:4.7.4 +parallel-netcdf') + variant('mpi', default=True, description='Enable parallel I/O for netcdf-4') variant('parallel-netcdf', default=False, |