Upgrade NetCDF to 4.8.1 (#3620)

* upgrade NetCDF to 4.8.1 * [NetCDF] Touch build_tarballs.jl to trigger a rebuild
JuliaPackaging · Oct 12, 2021 · 453fb46 · 453fb46
1 parent c601909
commit 453fb46
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/N/NetCDF/[email protected]/build_tarballs.jl b/N/NetCDF/[email protected]/build_tarballs.jl
@@ -2,6 +2,7 @@ include("../common.jl")
 
 # Offset to add to the version number
 version_offset = v"0.1.0"
+
 # Minimum Julia version supported: this is important to decide which versions of
 # the dependencies to use, in particular the JLL stdlibs.
 min_julia_version = v"1.3"

diff --git a/N/NetCDF/[email protected]/build_tarballs.jl b/N/NetCDF/[email protected]/build_tarballs.jl
@@ -2,6 +2,7 @@ include("../common.jl")
 
 # Offset to add to the version number.  Remember to always bumpt this.
 version_offset = v"0.2.0"
+
 # Minimum Julia version supported: this is important to decide which versions of
 # the dependencies to use, in particular the JLL stdlibs.
 min_julia_version = v"1.6"

diff --git a/N/NetCDF/common.jl b/N/NetCDF/common.jl
@@ -9,15 +9,15 @@ function configure(version_offset, min_julia_version)
     # So for example version 2.6.3 would become 200.600.300.
 
     name = "NetCDF"
-    upstream_version = v"4.7.4"
+    upstream_version = v"4.8.1"
     version = VersionNumber(upstream_version.major * 100 + version_offset.major,
                             upstream_version.minor * 100 + version_offset.minor,
                             upstream_version.patch * 100 + version_offset.patch)
 
     # Collection of sources required to build NetCDF
     sources = [
         ArchiveSource("https://github.com/Unidata/netcdf-c/archive/v$(upstream_version).zip",
-                      "170c9c9020f8909811b06e1034d5ea9288b3d5bd90793e3dd27490191faa7566")
+                      "e4e75523466de4187cff29784ff12755925f17e753bff0c9c46cd670ca63c6b2")
     ]
 
     # HDF5.h in /workspace/artifacts/805ccba77cd286c1afc127d1e45aae324b507973/include
@@ -28,13 +28,19 @@ cd $WORKSPACE/srcdir/netcdf-c-*
 export CPPFLAGS="-I${includedir}"
 export LDFLAGS="-L${libdir}"
 export LDFLAGS_MAKE="${LDFLAGS}"
+CONFIGURE_OPTIONS=""
 
 if [[ ${target} == *-mingw* ]]; then
     export LIBS="-lhdf5-0 -lhdf5_hl-0 -lcurl-4 -lz"
     # linking fails with: "libtool:   error: can't build x86_64-w64-mingw32 shared library unless -no-undefined is specified"
     # unless -no-undefined is added to LDFLAGS
     LDFLAGS_MAKE="${LDFLAGS} ${LIBS} -no-undefined"
 
+    # testset fails on mingw (NetCDF 4.8.1)
+    # libtool: link: cc -fno-strict-aliasing -o .libs/pathcvt.exe pathcvt.o  -L/workspace/destdir/bin ../liblib/.libs/libnetcdf.dll.a -lhdf5-0 -lhdf5_hl-0 -lcurl-4 -lz -L/workspace/destdir/lib
+    # pathcvt.o:pathcvt.c:(.text+0x15c): undefined reference to `NCpathcvt'
+    CONFIGURE_OPTIONS="--disable-testsets"
+
 elif [[ "${target}" == *-apple-* ]]; then
     # this file is referenced by hdf.h by not installed
     touch ${includedir}/features.h
@@ -45,7 +51,8 @@ fi
     --host=${target} \
     --disable-utilities \
     --enable-shared \
-    --disable-static
+    --disable-static \
+    $CONFIGURE_OPTIONS
 make LDFLAGS="${LDFLAGS_MAKE}" -j${nproc}
 make install
 nc-config --all
@@ -73,7 +80,7 @@ nc-config --all
 
     # Dependencies that must be installed before this package can be built
     dependencies = [
-        Dependency(PackageSpec(name="HDF5_jll", version="1.12.0")),
+        Dependency(PackageSpec(name="HDF5_jll"), compat="1.12.0"),
         Dependency("Zlib_jll"),
     ]