netcdf-c@4.7.3:4.7.4 patch detection of pnetcdf for spectrum-mpi (#22180)

This commit is contained in:
eugeneswalker 2021-03-09 15:11:49 -08:00 committed by GitHub
parent 3006da8197
commit 1492461b8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 0 deletions

View File

@ -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

View File

@ -53,6 +53,9 @@ def url_for_version(self, version):
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,