Updated vampirtrace-5.12.2 sit class file for hermit1; minor bugfixes.

packages/performance/vampirtrace/vampirtrace-5.12.2

@@ -16,20 +16,31 @@ A="VampirTrace-${VERSION}.tar.gz"
 P="VampirTrace-${VERSION}"
 
 enable_papi=${enable_papi:=1}
-enable_papi=${enable_cuda:=0}
+enable_cuda=${enable_cuda:=0}
 
 
 # Other interesting configure options:
 #--enable-sampling \
-CONFIGURE_OPTS="$CONFIGURE_OPTS \
+
+if [[ $PLATFORM == "hermit1" ]] ; then
+    CONFIGURE_OPTS=" \
+        --with-platform=crayxt \
+        "
+else
+    CONFIGURE_OPTS=" \
         --with-mpi-dir=$MPI_DIR \
         "
+fi
 
 # use PAPI
 if [ $enable_papi != 0 ] ; then
+    if [[ $PLATFORM == "hermit1" ]] ; then
         module load papi
-    PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-papi-dir=$PAPI_DIR"
+    else
+        module load performance/papi
+        #PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
+        #CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-papi-dir=$PAPI_DIR"
+    fi	
 fi
 
 # use CUDA
@@ -44,3 +55,9 @@ if [ $enable_cuda != 0 ] ; then
         --with-cudart-lib-dir=$CUDA_DIR/lib64 \
         "
 fi
+
+src_prepare() {
+    if [[ $PLATFORM == "hermit1" ]] ; then
+        patch config/defaults/crayxt < $SCLASS_DIR/$SCLASSFILE-hermit-0000.patch
+    fi
+}

packages/performance/vampirtrace/vampirtrace-5.12.2-hermit-0000.patch

@@ -0,0 +1,4 @@
+17c17
+< with_shlibc=/lib64/libc-2.4.so
+---
+> with_shlibc=/lib64/libc-2.11.1.so