From 4993d93770f5df22fb0bffa195af57514baddf21 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Tue, 12 Nov 2013 18:26:51 +0100 Subject: [PATCH] (attempt to) fix fortran build on systems where sh!=bash --- src/smpi/smpif90.in | 5 ++--- src/smpi/smpiff.in | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in index c0cb3482b9..64748ca418 100644 --- a/src/smpi/smpif90.in +++ b/src/smpi/smpif90.in @@ -9,8 +9,7 @@ FFLAGS="-ff2c -fno-second-underscore" LINKARGS="-lsimgrid -lm -lgfortran" main_name=main -declare -a TMPFILES -trap 'rm -f "${TMPFILES[@]}"' EXIT +trap 'rm -f ${TMPFILES}' EXIT # $1: prefix, $2: suffix mymktemp () { @@ -41,7 +40,7 @@ while [ -n "$1" ]; do ;; *.f90|*.F90) TMPFILE=$(mymktemp "${ARG}" ".f90") - TMPFILES+="${TMPFILE}" + TMPFILES="${TMPFILES} ${TMPFILE}" #replace "program main_name by subroutine user\_main (and the end clause as well)" sed 's/[[:space:]]*program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/subroutine user\_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' ${ARG} > ${TMPFILE} SRCFILE="${TMPFILE}" diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in index 21bc82a19b..cb75fe020c 100644 --- a/src/smpi/smpiff.in +++ b/src/smpi/smpiff.in @@ -3,8 +3,6 @@ prefix="@exec_prefix@" ARGS="-DMAIN__=user_main -Diargc_=smpi_process_argc -Dgetarg_=smpi_process_getarg" LINKARGS="-L@F2C_LIBRARY_PATH@ -lf2c -lm" -declare -a SRCFILES - # $1: prefix, $2: suffix mymktemp () { tmp=$(mktemp --suffix="$2" "$1_XXXXXXXXXX" 2> /dev/null) @@ -31,7 +29,7 @@ while [ -n "$1" ]; do if [ -z "$SRCFILE" ] ; then SRCFILE="$ARG" fi - SRCFILES+="${SRCFILE}" + SRCFILES="${SRCFILES} ${SRCFILE}" ;; *) if [ "${ARG}" = "-c" ]; then @@ -45,7 +43,7 @@ ARGS="${ARGS} ${LINKARGS}" if [ -n "${SRCFILES}" ] then - for SRCFILE in "${SRCFILES[@]}" + for SRCFILE in ${SRCFILES} do TMPFILE=$(mymktemp "${SRCFILE}" ".f") cp ${SRCFILE} ${TMPFILE} -- 2.20.1