From aaa6f232885c1de93a2b385bcbc096db7ac2a848 Mon Sep 17 00:00:00 2001
From: Juan Escobar <juan.escobar@aero.obs-mip.fr>
Date: Tue, 8 Mar 2016 09:51:30 +0000
Subject: [PATCH] Juan 08/03/2016: add HDF_CONF='-std=c99' option for gcc > 5.X
for pb in hdf compilation
---
src/Makefile | 4 ++--
src/Rules.LXgfortran.mk | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index a89aa69e8..ae3e72dcf 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -332,9 +332,9 @@ ifeq "$(VER_CDF)" "CDFAUTO"
cdf : $(CDF_INC)
$(CDF_INC) :
cd ${DIR_HDF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --with-zlib=no \
- FC="$(FC)" FCFLAGS="$(OPT_BASE)" CPPFLAGS="-DpgiFortran" && make && make install
+ FC="$(FC)" FCFLAGS="$(OPT_BASE)" CPPFLAGS="-DpgiFortran" ${HDF_CONF} && make && make install
cd ${DIR_CDF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --disable-cxx --disable-f90 --disable-dap \
- FC="$(FC)" FCFLAGS="$(OPT_BASE)" CPPFLAGS="-DpgiFortran ${INC_NETCDF}" LDFLAGS=" -L${CDF_PATH}/lib64" && make && make install
+ FC="$(FC)" FCFLAGS="$(OPT_BASE)" CPPFLAGS="-DpgiFortran ${INC_NETCDF}" ${CDF_CONF} LDFLAGS=" -L${CDF_PATH}/lib64" && make && make install
cleanmaster : cleancdf
cleancdf :
diff --git a/src/Rules.LXgfortran.mk b/src/Rules.LXgfortran.mk
index 0641238a3..7a01c286b 100644
--- a/src/Rules.LXgfortran.mk
+++ b/src/Rules.LXgfortran.mk
@@ -86,6 +86,10 @@ endif
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=_gfortran
+#
+# Netcdf/HDF5 flags
+#
+HDF_CONF= CFLAGS=-std=c99
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
--
GitLab