From b5943ae29522c5b9a26c7a6ad419cbbb85771a3a Mon Sep 17 00:00:00 2001
From: Giovanni La Mura <giovanni.lamura@inaf.it>
Date: Thu, 19 Dec 2024 13:36:11 +0100
Subject: [PATCH] Reintroduce legacy FORTRAN flag in compatibility tests

---
 .gitlab-ci.yml     | 6 +++---
 build/configure.sh | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ca49957..2cdafcb7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,7 +92,7 @@ compatibility_stage:
       - mkdir build_clang16
       - cd build_clang16
       - cp -r ../build/* .
-      - CXX=clang++-16 F77=flang-new-16 ./configure --with-fflags="-O3" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-16/lib -L/usr/lib/gcc/x86_64-linux-gnu/13" --disable-openmp
+      - CXX=clang++-16 F77=flang-new-16 ./configure --with-fflags="-O3 -std=legacy" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-16/lib -L/usr/lib/gcc/x86_64-linux-gnu/13" --disable-openmp
       - make wipe
       - make -j
       - echo "Running make with flang version 17 and clang version 17..."
@@ -101,7 +101,7 @@ compatibility_stage:
       - mkdir build_clang17
       - cd build_clang17
       - cp -r ../build/* .
-      - CXX=clang++-17 F77=flang-new-17 ./configure --with-fflags="-O3" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-17/lib -L/usr/lib/gcc/x86_64-linux-gnu/13"  --disable-openmp
+      - CXX=clang++-17 F77=flang-new-17 ./configure --with-fflags="-O3 -std=legacy" --with-include="-I/usr/include/c++/13 -I/usr/include/x86_64-linux-gnu/c++/13" --with-ldflags="-L/usr/lib/llvm-17/lib -L/usr/lib/gcc/x86_64-linux-gnu/13"  --disable-openmp
       - make wipe
       - make -j
       #- echo "Running make with Intel ifort and Intel icpx..."
@@ -123,7 +123,7 @@ compatibility_stage:
       - cp -r ../build/* .
       - export LD_LIBRARY_PATH=/opt/intel/oneapi/compiler/latest/lib
       - export PATH=/opt/intel/oneapi/compiler/latest/bin:$PATH
-      - CXX=icpx F77=ifx ./configure --with-fflags="-O3" --disable-openmp
+      - CXX=icpx F77=ifx ./configure --with-fflags="-O3 -std=legacy" --disable-openmp
       - make wipe
       - make -j
    
diff --git a/build/configure.sh b/build/configure.sh
index a7a1bd37..0f3583d7 100755
--- a/build/configure.sh
+++ b/build/configure.sh
@@ -578,6 +578,7 @@ fi
 # End of LAPACK checks
 # cuBLAS checks
 if [ "x$CUBLAS" != "xno" ]; then
+    echo -n "configure: checking for cuBLAS... "
     pkg-config --version > /dev/null
     use_pkg_config=$?
     if [ "x${CUDAFLAGS}${CUDALDFLAGS}" = "x" ]; then
-- 
GitLab