hpcchris/sit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Specify F77 before Fortran (F90, F2003, F2008) compilers

Browse source 
- 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)
This commit is contained in:
Rainer Keller 2012-01-10 11:31:07 +00:00 committed by Christoph Niethammer
parent 77227dcc92
commit 28db8095c5
5 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/platform-configs/laki/compiler/gnu
View file

@ -1,3 +1,3 @@
#!/bin/bash #!/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" COMPILER_VERSION_CMD="gcc -dumpversion"

2
etc/platform-configs/laki/compiler/intel
View file

@ -1,3 +1,3 @@
#!/bin/bash #!/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" COMPILER_VERSION_CMD="icc -dumpversion"

2
etc/sit.conf
View file

@ -12,7 +12,7 @@ SCLASS_DIR=${SCLASS_DIR:="$SIT_PATH/packages"}
# basic installation directory # basic installation directory
PREFIX_BASE=${PREFIX_BASE:="$HOME/bin"} PREFIX_BASE=${PREFIX_BASE:="$HOME/bin"}
MAKEOPTS="-j$(cat /proc/cpuinfo | grep -c processor)" MAKEOPTS=${MAKEOPTS:=""}
# default platform for unknown platforms # default platform for unknown platforms
DEFAULT_PLATFORM="laki" DEFAULT_PLATFORM="laki"

10
functions.sh
View file

@ -60,7 +60,7 @@ sit_prepare() {
src_configure() { src_configure() {
${SRCDIR}/configure --prefix=$PREFIX $CONFIGURE_OPTS ${SRCDIR}/configure --prefix=$PREFIX $CONFIGURE_OPTS
if [ ! -z $LOGDIR ] ; then if [ ! -z $LOGDIR -a -f config.log ] ; then
cp config.log $LOGDIR cp config.log $LOGDIR
fi fi
} }
@ -111,9 +111,11 @@ sit_install() {
} }
sit_copy_logs() { sit_copy_logs() {
cd $LOGDIR if [ ! -z $LOGDIR ] ; then
bzip2 *.log cd $LOGDIR
cp $LOGDIR/*.bz2 $PREFIX bzip2 *.log
cp $LOGDIR/*.bz2 $PREFIX
fi
} }
src_setperms() { src_setperms() {

17
sit
View file

@ -155,20 +155,25 @@ echo "Logfile dir: $LOGDIR"
sit_countdown 3 sit_countdown 3
if [ -d ${WORKDIR} ] ; then #if [ -d ${WORKDIR} ] ; then
sit_info "Removing existing working directory ${WORKDIR}" # sit_info "Removing existing working directory ${WORKDIR}"
sit_countdown 5 # sit_countdown 5
rm -rf ${WORKDIR} # rm -rf ${WORKDIR}
fi #fi
mkdir -p ${WORKDIR} mkdir -p ${WORKDIR}
mkdir -p ${BUILDDIR} mkdir -p ${BUILDDIR}
mkdir -p ${LOGDIR} if [ ! -z ${LOGDIR} ] ; then
mkdir -p ${LOGDIR}
else
LOGDIR="/tmp"
fi
sit_sitinfo >> "$LOGDIR/sit_cmd.log" sit_sitinfo >> "$LOGDIR/sit_cmd.log"
sit_unpack 2>&1 | tee "$LOGDIR/unpack.log"; ( exit ${PIPESTATUS} ) sit_unpack 2>&1 | tee "$LOGDIR/unpack.log"; ( exit ${PIPESTATUS} )
sit_prepare 2>&1 | tee "$LOGDIR/prepare.log"; ( exit ${PIPESTATUS} ) sit_prepare 2>&1 | tee "$LOGDIR/prepare.log"; ( exit ${PIPESTATUS} )
sit_configure 2>&1 | tee "$LOGDIR/configure.log"; ( exit ${PIPESTATUS} ) sit_configure 2>&1 | tee "$LOGDIR/configure.log"; ( exit ${PIPESTATUS} )
sit_build 2>&1 | tee "$LOGDIR/make.log"; ( exit ${PIPESTATUS} ) sit_build 2>&1 | tee "$LOGDIR/make.log"; ( exit ${PIPESTATUS} )
sit_pretest 2>&1 | tee "$LOGDIR/pretest.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_install 2>&1 | tee "$LOGDIR/make_install.log"; ( exit ${PIPESTATUS} )
sit_posttest 2>&1 | tee "$LOGDIR/posttest.log"; ( exit ${PIPESTATUS} ) sit_posttest 2>&1 | tee "$LOGDIR/posttest.log"; ( exit ${PIPESTATUS} )