From 62fe84c268675051d5122dd59154f92405a66dfd Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 20 Jan 2023 10:30:31 +0100
Subject: [PATCH] Philippe 24/01/2024: Philippe 20/01/2023: compile new
versions of libaec, HDF5 and netCDF
(cherry picked from commit d3c148fa8b6441a1589827373634ffa91d357186)
---
src/Makefile | 4 ++--
src/configure | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index da60ed11c..ce65eb47f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-#MNH_LIC Copyright 1994-2022 CNRS, Meteo-France and Universite Paul Sabatier
+#MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier
#MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
#MNH_LIC for details. version 1.
@@ -341,7 +341,7 @@ NETCDF_OPT ?= ${OPT_BASE_I4:-$OPT_BASE}
#
cdf : $(CDF_MOD)
$(CDF_MOD) :
- cd ${DIR_LIBAEC} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 CC="$(CC)" CFLAGS="$(HDF_OPT)" ${CDF_CONF} && \
+ cd ${DIR_LIBAEC} && autoreconf -i && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 CC="$(CC)" CFLAGS="$(HDF_OPT)" ${CDF_CONF} && \
$(MAKE) && $(MAKE) install && $(MAKE) clean
cd ${DIR_HDF} && ./configure --enable-fortran --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --with-szlib=${CDF_PATH}/include,${CDF_PATH}/lib64 \
CC="$(CC)" CFLAGS="$(HDF_OPT)" ${HDF_CONF} FC="$(FC)" FCFLAGS="$(NETCDF_OPT)" LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lsz -laec -lz" && \
diff --git a/src/configure b/src/configure
index 3894e25af..e51c5e3cd 100755
--- a/src/configure
+++ b/src/configure
@@ -1,5 +1,5 @@
#!/bin/bash
-#MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier
+#MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier
#MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
#MNH_LIC for details. version 1.
@@ -12,11 +12,11 @@ export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-5-OPENACC-FFT}
export VERSION_BUG=${VERSION_BUG:-1}
export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}${VER_OASIS:+-${VER_OASIS}}}
export VERSION_DATE=${VERSION_DATE:-"19/03/2021"}
-export VERSION_LIBAEC=${VERSION_LIBAEC:-"0.3.4"}
-export VERSION_HDF=${VERSION_HDF:-"1.12.0"}
-export VERSION_CDFC=${VERSION_CDFC:-"4.7.4"}
+export VERSION_LIBAEC=${VERSION_LIBAEC:-"v1.0.6"}
+export VERSION_HDF=${VERSION_HDF:-"1.14.0"}
+export VERSION_CDFC=${VERSION_CDFC:-"4.9.0"}
export VERSION_CDFCXX=${VERSION_CDFCXX:-"4.3.1"}
-export VERSION_CDFF=${VERSION_CDFF:-"4.5.3"}
+export VERSION_CDFF=${VERSION_CDFF:-"4.6.0"}
export VERSION_GRIBAPI=${VERSION_GRIBAPI:-"1.26.0-Source"}
export VERSION_ECCODES=${VERSION_ECCODES:-"2.18.0"}
export ECCODES_DEFINITION_PATH=${ECCODES_DEFINITION_PATH:-${SRC_MESONH}/src/LIB/eccodes-${VERSION_ECCODES}"/definitions/"}
--
GitLab