From 28db8095c531b9f8bbcc1d46323aa73627b9a584 Mon Sep 17 00:00:00 2001
From: Rainer Keller <keller@hlrs.de>
Date: Tue, 10 Jan 2012 11:31:07 +0000
Subject: [PATCH]  - Specify F77 before Fortran (F90, F2003, F2008) compilers 
 - Don't use -j2 make option by default, may break some non-conforming source
 builts  - Fix a few buglets (like LOGDIR , and when packages are NOT
 configure-based, aka    do not create a config.log file)

---
 etc/platform-configs/laki/compiler/gnu   |  2 +-
 etc/platform-configs/laki/compiler/intel |  2 +-
 etc/sit.conf                             |  2 +-
 functions.sh                             | 10 ++++++----
 sit                                      | 17 +++++++++++------
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/etc/platform-configs/laki/compiler/gnu b/etc/platform-configs/laki/compiler/gnu
index 50913ec..a2c385d 100644
--- a/etc/platform-configs/laki/compiler/gnu
+++ b/etc/platform-configs/laki/compiler/gnu
@@ -1,3 +1,3 @@
 #!/bin/bash
-COMPILER_OPTS="CC=gcc CXX=g++ FC=gfortran F90=gfortran F77=gfortran"
+COMPILER_OPTS="CC=gcc CXX=g++ F77=gfortran FC=gfortran"
 COMPILER_VERSION_CMD="gcc -dumpversion"
diff --git a/etc/platform-configs/laki/compiler/intel b/etc/platform-configs/laki/compiler/intel
index 6e419b7..846d854 100644
--- a/etc/platform-configs/laki/compiler/intel
+++ b/etc/platform-configs/laki/compiler/intel
@@ -1,3 +1,3 @@
 #!/bin/bash
-COMPILER_OPTS="CC=icc CXX=icpc FC=ifort F90=ifort F77=ifort"
+COMPILER_OPTS="CC=icc CXX=icpc F77=ifort FC=ifort"
 COMPILER_VERSION_CMD="icc -dumpversion"
diff --git a/etc/sit.conf b/etc/sit.conf
index 8c50779..80337f7 100644
--- a/etc/sit.conf
+++ b/etc/sit.conf
@@ -12,7 +12,7 @@ SCLASS_DIR=${SCLASS_DIR:="$SIT_PATH/packages"}
 # basic installation directory
 PREFIX_BASE=${PREFIX_BASE:="$HOME/bin"}
 
-MAKEOPTS="-j$(cat /proc/cpuinfo | grep -c processor)"
+MAKEOPTS=${MAKEOPTS:=""}
 
 # default platform for unknown platforms
 DEFAULT_PLATFORM="laki"
diff --git a/functions.sh b/functions.sh
index f6c4ebf..f68f315 100644
--- a/functions.sh
+++ b/functions.sh
@@ -60,7 +60,7 @@ sit_prepare() {
 
 src_configure() {
 	${SRCDIR}/configure --prefix=$PREFIX $CONFIGURE_OPTS
-    if [ ! -z $LOGDIR ] ; then
+    if [ ! -z $LOGDIR  -a -f config.log ] ; then
         cp config.log $LOGDIR
     fi
 }
@@ -111,9 +111,11 @@ sit_install() {
 }
 
 sit_copy_logs() {
-    cd $LOGDIR
-    bzip2 *.log
-    cp $LOGDIR/*.bz2 $PREFIX
+    if [ ! -z $LOGDIR ] ; then
+        cd $LOGDIR
+        bzip2 *.log
+        cp $LOGDIR/*.bz2 $PREFIX
+    fi
 }
 
 src_setperms() {
diff --git a/sit b/sit
index bc14eb6..e67055c 100755
--- a/sit
+++ b/sit
@@ -155,20 +155,25 @@ echo "Logfile dir:         $LOGDIR"
 
 sit_countdown 3
 
-if [ -d ${WORKDIR} ] ; then
-    sit_info "Removing existing working directory ${WORKDIR}"
-    sit_countdown 5
-    rm -rf ${WORKDIR}
-fi
+#if [ -d ${WORKDIR} ] ; then
+#    sit_info "Removing existing working directory ${WORKDIR}"
+#    sit_countdown 5
+#    rm -rf ${WORKDIR}
+#fi
 mkdir -p ${WORKDIR}
 mkdir -p ${BUILDDIR}
-mkdir -p ${LOGDIR}
+if [ ! -z ${LOGDIR} ] ; then
+    mkdir -p ${LOGDIR}
+else
+    LOGDIR="/tmp"
+fi
 
 sit_sitinfo >> "$LOGDIR/sit_cmd.log"
 sit_unpack    2>&1 | tee "$LOGDIR/unpack.log";       ( exit ${PIPESTATUS} )
 sit_prepare   2>&1 | tee "$LOGDIR/prepare.log";      ( exit ${PIPESTATUS} )
 sit_configure 2>&1 | tee "$LOGDIR/configure.log";    ( exit ${PIPESTATUS} )
 sit_build     2>&1 | tee "$LOGDIR/make.log";         ( exit ${PIPESTATUS} )
+
 sit_pretest   2>&1 | tee "$LOGDIR/pretest.log";      ( exit ${PIPESTATUS} )
 sit_install   2>&1 | tee "$LOGDIR/make_install.log"; ( exit ${PIPESTATUS} )
 sit_posttest  2>&1 | tee "$LOGDIR/posttest.log";     ( exit ${PIPESTATUS} )