From 8262742a200dca562720c33775b987d2017a3ce1 Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Tue, 3 Sep 2024 10:17:24 +0200
Subject: [PATCH] Joris P. 03/09/2024: fix OASIS compilation in parallel
---
src/LIB/oasis3-mct_5.0.tar.gz | 4 ++--
src/Makefile | 11 +++++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/LIB/oasis3-mct_5.0.tar.gz b/src/LIB/oasis3-mct_5.0.tar.gz
index 3af84015c..2f624d015 100644
--- a/src/LIB/oasis3-mct_5.0.tar.gz
+++ b/src/LIB/oasis3-mct_5.0.tar.gz
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d39285fc172359b64818dc475c6168fd036b98424175df070c8af26339376f9f
-size 14563632
+oid sha256:8c4dc638f5e65fcc3bcfb63c4f5ca1405778194e693a2100cc93aa3c40171fd4
+size 14563045
diff --git a/src/Makefile b/src/Makefile
index 092383fcb..981c7c8ae 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -384,16 +384,23 @@ endif
##########################################################
ifeq "$(VER_OASIS)" "OASISAUTO"
#
+ifeq "$(VER_CDF)" "CDFAUTO"
+$(OASIS_KEY) : $(CDF_MOD)
+endif
+#
oasis : $(OASIS_KEY)
$(OASIS_KEY):
- cd ${SRC_MESONH}/src/LIB/oasis3-mct_${VERSION_OASIS}/util/make_dir && make realclean -f TopMakefileOasis3 && make -f TopMakefileOasis3 && cd ${SRC_MESONH}/src/LIB/toy_${VERSION_TOY} && make clean -f Makefile_OASISMNH && make -f Makefile_OASISMNH
+ cd ${SRC_MESONH}/src/LIB/oasis3-mct_${VERSION_OASIS}/util/make_dir && \
+ $(MAKE) -f TopMakefileOasis3 makedirs-static makemct-static makescrip-static makepsmile-static && \
+ cd ${SRC_MESONH}/src/LIB/toy_${VERSION_TOY} && \
+ $(MAKE) -f Makefile_OASISMNH
cleanmaster : cleanoasis
cleanoasis :
- [ -d ${OASIS_PATH} ] && rm -fr ${OASIS_PATH}
toy:
- cd ${SRC_MESONH}/src/LIB/toy_${VERSION_TOY} && make clean -f Makefile_OASISMNH && make -f Makefile_OASISMNH
+ cd ${SRC_MESONH}/src/LIB/toy_${VERSION_TOY} && $(MAKE) clean -f Makefile_OASISMNH && $(MAKE) -f Makefile_OASISMNH
endif
##########################################################
# #
--
GitLab