From b66934358f8d9e2bb20b8486fae294a919db9ab6 Mon Sep 17 00:00:00 2001
From: Matthias Krack <matthias.krack@psi.ch>
Date: Thu, 9 Jan 2025 10:37:25 +0100
Subject: [PATCH] Fix build of libsmeagol with OpenMPI

---
 tools/toolchain/scripts/stage7/install_libsmeagol.sh | 9 +++++++--
 tools/toolchain/scripts/stage8/install_dftd4.sh      | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tools/toolchain/scripts/stage7/install_libsmeagol.sh b/tools/toolchain/scripts/stage7/install_libsmeagol.sh
index 9cd75673fd..468e2f70fd 100755
--- a/tools/toolchain/scripts/stage7/install_libsmeagol.sh
+++ b/tools/toolchain/scripts/stage7/install_libsmeagol.sh
@@ -39,10 +39,15 @@ case "${with_libsmeagol}" in
       [ -d libsmeagol-${libsmeagol_ver} ] && rm -rf libsmeagol-${libsmeagol_ver}
       tar -xzf libsmeagol-${libsmeagol_ver}.tar.gz
       cd libsmeagol-${libsmeagol_ver}
-      make -j $(get_nprocs) FC=${MPIFC} FCFLAGS="-DMPI ${FCFLAGS}" FCFLAGS_FIXEDFORM="" FCFLAGS_FREEFORM="" > make.log 2>&1 || tail -n ${LOG_LINES} make.log
+      make -j $(get_nprocs) \
+        FC=${MPIFC} \
+        FCFLAGS="-DMPI -fallow-argument-mismatch ${FCFLAGS}" \
+        FCFLAGS_FIXEDFORM="" \
+        FCFLAGS_FREEFORM="" \
+        > make.log 2>&1 || tail -n ${LOG_LINES} make.log
       # The libsmeagol makefile does not provide an install target
       [ -d ${pkg_install_dir} ] && rm -rf ${pkg_install_dir}
-      mkdir ${pkg_install_dir} && cp -ar lib ${pkg_install_dir}
+      mkdir ${pkg_install_dir} && cp -a lib ${pkg_install_dir}
       mkdir ${pkg_install_dir}/include && cp obj/*.mod ${pkg_install_dir}/include
       write_checksums "${install_lock_file}" "${SCRIPT_DIR}/stage7/$(basename ${SCRIPT_NAME})"
     fi
diff --git a/tools/toolchain/scripts/stage8/install_dftd4.sh b/tools/toolchain/scripts/stage8/install_dftd4.sh
index c5f2723212..2f8958ef3d 100755
--- a/tools/toolchain/scripts/stage8/install_dftd4.sh
+++ b/tools/toolchain/scripts/stage8/install_dftd4.sh
@@ -56,6 +56,7 @@ case "$with_dftd4" in
       CMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}:${OPENBLAS_ROOT}" cmake \
         -B . -G Ninja \
         -DCMAKE_INSTALL_PREFIX="${pkg_install_dir}" \
+        -DCMAKE_INSTALL_LIBDIR=lib \
         -DCMAKE_C_COMPILER="${MPICC}" \
         -DCMAKE_Fortran_COMPILER="${MPIFC}" \
         -DCMAKE_VERBOSE_MAKEFILE=ON \