From e137d3e94aeddd5721a82865dc840bdb12be2ddb Mon Sep 17 00:00:00 2001
From: Davide Sangalli <davide.sangalli@gmail.com>
Date: Tue, 27 Oct 2020 16:40:05 +0100
Subject: [PATCH]  Updated HDF5, netcdf and netcdff libraries

---
 lib/archive/package.list | 19 +++++++++----------
 lib/hdf5/Makefile.loc    |  3 ---
 lib/netcdf/Makefile.loc  | 11 ++++++++---
 lib/netcdff/Makefile.loc | 10 +++++++---
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/lib/archive/package.list b/lib/archive/package.list
index 5a63b26df2..3c3de6fdb0 100644
--- a/lib/archive/package.list
+++ b/lib/archive/package.list
@@ -1,7 +1,6 @@
 #
 # storing options
 #
-#keep_iotk=no
 keep_iotk=yes
 keep_netcdf=no
 keep_netcdff=no
@@ -18,9 +17,9 @@ keep_fftqe=no
 # tarball names
 #
 tarball_iotk=iotk-y1.2.2.tar.gz
-tarball_netcdf=netcdf-4.4.1.1.tar.gz
-tarball_netcdff=netcdf-fortran-4.4.4.tar.gz
-tarball_hdf5=hdf5-1.8.18.tar.gz
+tarball_netcdf=netcdf-c-4.7.4.tar.gz
+tarball_netcdff=netcdf-fortran-4.5.2.tar.gz
+tarball_hdf5=hdf5-1.12.0.tar.gz
 tarball_etsf_io=etsf_io-1.0.4.tar.gz
 tarball_libxc=libxc-2.2.3.tar.gz
 tarball_lapack=lapack-3.6.1.tar.gz
@@ -34,9 +33,9 @@ tarball_fftqe=fftqe.tar.gz
 # package names
 #
 pkgname_iotk=iotk
-pkgname_netcdf=netcdf-4.4.1.1
-pkgname_netcdff=netcdf-fortran-4.4.4
-pkgname_hdf5=hdf5-1.8.18
+pkgname_netcdf=netcdf-c-4.7.4
+pkgname_netcdff=netcdf-fortran-4.5.2
+pkgname_hdf5=hdf5-1.12.0
 pkgname_etsf_io=etsf_io-1.0.4
 pkgname_libxc=libxc-2.2.3
 pkgname_lapack=lapack-3.6.1
@@ -49,9 +48,9 @@ pkgname_fftqe=fftqe
 #
 # URL's
 #
-url_netcdf=https://github.com/yambo-code/yambo/files/855476/$(tarball_netcdf)
-url_netcdff=https://github.com/yambo-code/yambo/files/855477/$(tarball_netcdff)
-url_hdf5=https://github.com/yambo-code/yambo/files/838459/$(tarball_hdf5)
+url_netcdf=https://github.com/yambo-code/yambo/files/4570415/$(tarball_netcdf)
+url_netcdff=https://github.com/yambo-code/yambo/files/4570426/$(tarball_netcdff)
+url_hdf5=https://github.com/yambo-code/yambo/files/4574415/$(tarball_hdf5)
 url_libxc=https://github.com/yambo-code/yambo/files/783150/$(tarball_libxc)
 url_iotk=https://github.com/yambo-code/yambo/files/962173/$(tarball_iotk)
 url_etsf_io=https://github.com/yambo-code/yambo/files/845218/$(tarball_etsf)
diff --git a/lib/hdf5/Makefile.loc b/lib/hdf5/Makefile.loc
index dd623c3595..3534e4c8aa 100644
--- a/lib/hdf5/Makefile.loc
+++ b/lib/hdf5/Makefile.loc
@@ -35,12 +35,9 @@ configure-stamp: uncompress-stamp
 	      ./configure $(AUXFLAGS) \
 	      CC="$(cc)" \
 	      CPP="$(cpp)" \
-	      CFLAGS="$(cflags)" \
 	      CXX="$(cc)" \
 	      CXXCPP="$(cpp)" \
-	      CXXFLAGS="$(cflags)" \
 	      FC="$(fc)" \
-	      FCFLAGS="$(fcflags)" \
 	      CPPFLAGS="$(netcdf_aux)" ); \
 	fi
 	touch configure-stamp
diff --git a/lib/netcdf/Makefile.loc b/lib/netcdf/Makefile.loc
index 1bf588c30e..999739b7d2 100644
--- a/lib/netcdf/Makefile.loc
+++ b/lib/netcdf/Makefile.loc
@@ -20,6 +20,14 @@ AUXFLAGS=--prefix=$(LIBPATH) \
          --without-pic --enable-static --disable-shared \
          --disable-dap  $(netcdf_opt)
 
+# DEBUG <
+# This option is useful for debugging netcdf4 problems
+# --enable-logging
+# See also the connected call in src/setup/setup.F
+# call netcdf_call(nf90_set_log_level(3),1)
+# DEBUG >
+
+
 #
 # MAIN target
 #
@@ -36,12 +44,9 @@ configure-stamp: uncompress-stamp
 	      ./configure $(AUXFLAGS) \
 	      CC="$(cc)" \
 	      CPP="$(cpp)" \
-	      CFLAGS="$(cflags)" \
 	      CXX="$(cc)" \
 	      CXXCPP="$(cpp)" \
 	      FC="$(fc)" \
-	      FCFLAGS="$(fcflags)" \
-	      FFLAGS="$(fflags)" \
 	      CPPFLAGS="$(netcdf_flag) $(ihdf5)" \
 	      LIBS="$(lhdf5)" \
 	      F77="$(f77)" ); \
diff --git a/lib/netcdff/Makefile.loc b/lib/netcdff/Makefile.loc
index dcac3f8994..125476916b 100644
--- a/lib/netcdff/Makefile.loc
+++ b/lib/netcdff/Makefile.loc
@@ -19,6 +19,13 @@ TARBALL=$(tarball_netcdff)
 AUXFLAGS=--prefix=$(LIBPATH) \
          --without-pic --enable-static --disable-shared
 
+# DEBUG <
+# This option is useful for debugging netcdf4 problems
+# --enable-logging
+# See also the connected call in src/setup/setup.F
+# call netcdf_call(nf90_set_log_level(3),1)
+# DEBUG >
+
 #
 # MAIN target
 #
@@ -35,12 +42,9 @@ configure-stamp: uncompress-stamp
 	      ./configure $(AUXFLAGS) \
 	      CC="$(cc)" \
 	      CPP="$(cpp)" \
-	      CFLAGS="$(cflags)" \
 	      CXX="$(cc)" \
 	      CXXCPP="$(cpp)" \
 	      FC="$(fc)" \
-	      FCFLAGS="$(fcflags)" \
-	      FFLAGS="$(fflags)" \
 	      CPPFLAGS="$(netcdf_flag) $(ihdf5) $(inetcdf)" \
 	      LIBS="$(lnetcdf) $(lhdf5)" \
 	      F77="$(f77)" ); \