Mercurial > mxe-octave

changeset 5431:440ce30431c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/netcdf.mk: Update version to 4.7.4. * src/netcdf-1-fixes.patch: Add new patch file for mingw. * dist-files.mk: Add new file to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 27 May 2020 21:37:40 +0200
parents 98bcc037fad7
children 71761e1b5e83
files dist-files.mk src/netcdf-1-fixes.patch src/netcdf.mk
diffstat 3 files changed, 21 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Mon May 25 18:14:52 2020 +0200
+++ b/dist-files.mk	Wed May 27 21:37:40 2020 +0200
@@ -436,6 +436,7 @@
   native-gcc.mk \
   ncurses-1-gcc-5-fix.patch \
   ncurses.mk \
+  netcdf-1-fixes.patch \
   netcdf.mk \
   nettle-1-fixes.patch \
   nettle.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/netcdf-1-fixes.patch	Wed May 27 21:37:40 2020 +0200
@@ -0,0 +1,14 @@
+diff --git "a/netcdf/ncdump/ncvalidator.c" "b/netcdf/ncdump/ncvalidator.c"
+index a0e4acb..2a7c5af 100644
+--- "a/ncdump/ncvalidator.c"	
++++ "b/ncdump/ncvalidator.c"
+@@ -76,7 +76,9 @@ THIS SOFTWARE.
+ #ifdef _WIN32
+ #include <io.h>
+ #define snprintf _snprintf
++#ifndef HAVE_UNISTD_H
+ #include "XGetopt.h"
++#endif
+ int opterr;
+ int optind;
+ #endif
--- a/src/netcdf.mk	Mon May 25 18:14:52 2020 +0200
+++ b/src/netcdf.mk	Wed May 27 21:37:40 2020 +0200
@@ -3,12 +3,11 @@
 
 PKG             := netcdf
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.3.2
-$(PKG)_CHECKSUM := dc26276da6a14f3f3a84cca6e87dc354a503dfdc
+$(PKG)_VERSION  := 4.7.4
+$(PKG)_CHECKSUM := dce4851dd65bf8ec985f11711bb5a8aa299515b9
 $(PKG)_SUBDIR   := netcdf-c-$($(PKG)_VERSION)
-$(PKG)_FILE     := netcdf-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL_DISABLED := ftp://ftp.unidata.ucar.edu/pub/netcdf/old/$($(PKG)_FILE)
-$(PKG)_URL      := https://src.fedoraproject.org/repo/pkgs/$(PKG)/$($(PKG)_FILE)/6d0a2a1e2bd854390062f4a808dd94c4/$($(PKG)_FILE)
+$(PKG)_FILE     := netcdf-c-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := ftp://ftp.unidata.ucar.edu/pub/netcdf/$($(PKG)_FILE)
 $(PKG)_DEPS     := curl hdf5
 
 define $(PKG)_UPDATE
@@ -38,8 +37,8 @@
         --prefix='$(HOST_PREFIX)' \
         $($(PKG)_CONFIGURE_OPTIONS) \
 	&& $($(PKG)_CONFIGURE_POST_HOOK)
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS='-no-undefined'
+    $(MAKE) -C '$(1)' -j 1 install LDFLAGS='-no-undefined' $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
   
     if [ ! "x$(MXE_NATIVE_BUILD)" = "xyes" ]; then \
       $(LN_SF) '$(HOST_BINDIR)/nc-config' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)nc-config'; \