Mercurial > mxe-octave
changeset 6929:2e0ebe56c89b
netcdf: update to v4.9.2
* src/netcdf.mk: update to 4.9.2, use cmake
* src/netcdf-1-fixes.patch: removed file
* dist-files.mk: removed ref to patch file
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Wed, 18 Oct 2023 07:17:41 -0400 |
| parents | 804737b64cbc |
| children | 8ff9947b6bdc |
| files | dist-files.mk src/netcdf-1-fixes.patch src/netcdf.mk |
| diffstat | 3 files changed, 22 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Sun Oct 15 10:51:35 2023 -0400 +++ b/dist-files.mk Wed Oct 18 07:17:41 2023 -0400 @@ -448,7 +448,6 @@ native-gcc.mk \ ncurses-1-gcc-5-fix.patch \ ncurses.mk \ - netcdf-1-fixes.patch \ netcdf.mk \ nettle-1-fixes.patch \ nettle.mk \
--- a/src/netcdf-1-fixes.patch Sun Oct 15 10:51:35 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -From 9a8a2eb2694581f6caf103aee593ca9607be17bd Mon Sep 17 00:00:00 2001 -From: Milton Woods <miltonjwoods@gmail.com> -Date: Mon, 23 Aug 2021 14:22:57 +1000 -Subject: [PATCH] Fix path conversions for mingw-w64 - ---- - libdispatch/dpathmgr.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libdispatch/dpathmgr.c b/libdispatch/dpathmgr.c -index eb450534e..6a5890423 100644 ---- a/libdispatch/dpathmgr.c -+++ b/libdispatch/dpathmgr.c -@@ -861,7 +861,7 @@ getlocalpathkind(void) - kind = NCPD_CYGWIN; - #elif __MSYS__ - kind = NCPD_MSYS; --#elif _MSC_VER /* not _WIN32 */ -+#elif defined(_MSC_VER) || defined(__MINGW32__) /* not _WIN32 */ - kind = NCPD_WIN; - #else - kind = NCPD_NIX;
--- a/src/netcdf.mk Sun Oct 15 10:51:35 2023 -0400 +++ b/src/netcdf.mk Wed Oct 18 07:17:41 2023 -0400 @@ -3,8 +3,8 @@ PKG := netcdf $(PKG)_IGNORE := -$(PKG)_VERSION := 4.8.1 -$(PKG)_CHECKSUM := ae9e8741aebdb3ba4494a78a7f5a32e92516edc1 +$(PKG)_VERSION := 4.9.2 +$(PKG)_CHECKSUM := 0eb6fdcbd725bd53bb9e98405a2cb15f3c511ce2 $(PKG)_SUBDIR := netcdf-c-$($(PKG)_VERSION) $(PKG)_FILE := netcdf-c-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/Unidata/netcdf-c/archive/v$($(PKG)_VERSION).tar.gz @@ -14,32 +14,27 @@ $(call GITHUB_PKG_UPDATE,Unidata,netcdf-c,v) endef -ifeq ($(MXE_WINDOWS_BUILD),yes) - $(PKG)_CONFIGURE_OPTIONS := CPPFLAGS='-DH5_USE_110_API -DDLL_NETCDF -I$(HOST_PREFIX)/include' -else - $(PKG)_CONFIGURE_OPTIONS := CPPFLAGS='-DH5_USE_110_API -I$(HOST_PREFIX)/include' -endif - -$(PKG)_CONFIGURE_POST_HOOK := $(CONFIGURE_POST_HOOK) -ifeq ($(MXE_SYSTEM),msvc) - $(PKG)_CONFIGURE_POST_HOOK += -x -endif +define $(PKG)_BUILD + cd '$(1)' && cmake \ + $($(PKG)_CMAKE_FLAGS) \ + -DBUILD_UTILITIES=OFF \ + -DENABLE_EXAMPLES=OFF \ + -DENABLE_TESTS=OFF \ + -DENABLE_PARALLEL_TESTS=OFF \ + -DENABLE_DAP_REMOTE_TESTS=OFF \ + -DENABLE_DAP=ON \ + -DENABLE_NETCDF_4=ON \ + -DENABLE_BYTERANGE=OFF \ + -DENABLE_LOGGING=ON \ + -DBUILD_TESTING=no \ + $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + . -define $(PKG)_BUILD - if [ $(MXE_SYSTEM) = msvc ]; then \ - cd '$(1)' && autoreconf -f -i -v; \ - fi - cd '$(1)' && ./configure \ - $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ - --enable-hdf5 --disable-testsets --disable-utilities \ - $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ - $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(HOST_PREFIX)' \ - $($(PKG)_CONFIGURE_OPTIONS) \ - && $($(PKG)_CONFIGURE_POST_HOOK) - $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS='-no-undefined -L$(HOST_LIBDIR)' $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) V=1 - $(MAKE) -C '$(1)' -j 1 install LDFLAGS='-no-undefined -L$(HOST_LIBDIR)' $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)' - + $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1)' -j '1' VERBOSE=1 DESTDIR='$(3)' install + if [ ! "x$(MXE_NATIVE_BUILD)" = "xyes" ]; then \ $(LN_SF) '$(HOST_BINDIR)/nc-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)nc-config'; \ fi