Cray: load compat module when swaping compiler

packages/compiler/mcxx/mcxx-any

@@ -34,20 +34,11 @@ P=${MCXX_PACKAGE}-${MCXX_VERSION%%-*} # remove date suffix starting from the fir
 # build with debugging symbols (0|1)
 enable_debug=${enable_debug:=0}
 
-# fortran support (requires recent sqlite3 dev) 
-enable_fortran=${enable_fortran:=1}
-
 # Other interesting configure options:
 CONFIGURE_OPTS=" \
 		--enable-ompss \
 		--with-nanox=$NANOX_HOME \
-        "
+                --enable-static  "
-if [ $enable_fortran == 1 ] ; then
-    echo "Building with Fortran support"
-    CONFIGURE_OPTS+=" --enable-fortran "
-else
-    CONFIGURE_OPTS+=" --enable-fortran=no "
-fi
 
 src_pretest() {
 	/bin/true

packages/libs/nanox/nanox-any

@@ -41,7 +41,8 @@ enable_extrae=${enable_extrae:=1}
 enable_ayudame=${enable_ayudame:=0}
 # build with debugging symbols (0|1)
 enable_debug=${enable_debug:=0}
- 
+# enable hwloc
+enable_hwloc=${enable_hwloc:=1} 
 
 # Other interesting configure options:
 #CONFIGURE_OPTS=" \
@@ -75,6 +76,13 @@ if [ $enable_ayudame == 1 ] ; then
     CONFIGURE_OPTS+=" --with-ayudame=$TEMANEJO_HOME"
 fi
 
+if [ $enable_hwloc == 1 ] ; then
+    echo "Building with hwloc"
+    HWLOC_DIR=$(dirname $(dirname $(which hwloc-ls)))
+    CONFIGURE_OPTS+=" --with-hwloc=$HWLOC_DIR"
+fi
+
+
 src_pretest() {
 	/bin/true
 }

packages/performance/extrae/extrae-3.0.1

@@ -9,6 +9,8 @@ PACKAGE="extrae"
 VERSION="3.0.1"
 URL="http://www.bsc.es/computer-sciences/extrae"
 INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
+: ${MPI_DIR:=$MPICH_DIR}   # on cray MPI_DIR is not defined, but MPICH_DIR
+echo "MPI_DIR=" $MPI_DIR
 
 # Archive A and package name P
 A=${PACKAGE}-${VERSION}.tar.bz2

sit

@@ -76,6 +76,9 @@ else
                 else
                     module swap $COMPILER $COMPILER/$COMPILER_VERSION
                 fi
+		# adjust MPICH and libsci versions to match compiler
+		module load cray-mpich-compat/v7 \
+		    || module load cray-mpich-compat/v6
             fi
             MPI_DIR=$MPICH_DIR
             ;;