From 22368253bc884e66089e603da3bb6e9c1f89800a Mon Sep 17 00:00:00 2001 From: Christoph Niethammer Date: Wed, 10 Jul 2013 08:57:38 +0000 Subject: [PATCH] Updated nanox sit class file. --- packages/libs/nanox/nanox-master | 14 ++++++++------ packages/libs/nanox/nanox-master-0001.patch | 4 ++++ 2 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 packages/libs/nanox/nanox-master-0001.patch diff --git a/packages/libs/nanox/nanox-master b/packages/libs/nanox/nanox-master index e044ac3..ed48a68 100644 --- a/packages/libs/nanox/nanox-master +++ b/packages/libs/nanox/nanox-master @@ -29,8 +29,8 @@ SRCDIR="$SRC_POOL/nanox/nanox.git" # enable instrumentation (0|1) enable_extrae=${enable_extrae:=1} -# build with ayudame support (0|1) -enable_ayudame=${enable_ayudame:=1} +# build with temanejo support (0|1) +enable_temanejo=${enable_temanejo:=1} # build with debugging symbols (0|1) enable_debug=${enable_debug:=0} @@ -51,10 +51,11 @@ if [ $enable_extrae == 1 ] ; then CONFIGURE_OPTS+=" --with-extrae=$EXTRAE_HOME" fi -if [ $enable_ayudame == 1 ] ; then - module load libs/ayudame - echo "Building with AYUDAME_HOME=$AYUDAME_HOME" - CONFIGURE_OPTS+=" --with-ayudame=$AYUDAME_HOME" +if [ $enable_temanejo == 1 ] ; then + module load debugger/temanejo + echo "Building with AYUDAME_HOME=$TEMANEJO_HOME" + CONFIGURE_OPTS+=" --with-ayudame=$TEMANEJO_HOME" + #LDFLAGS+=" -L$TEMANEJO_HOME" fi @@ -69,6 +70,7 @@ src_prepare() { rm -rf autom4te.cache autoreconf -vif version=$(git rev-list -n 1 master) + patch src/plugins/instrumentation/ayudame.cpp < $SCLASS_DIR/$SCLASSFILE-0001.patch } src_install() { diff --git a/packages/libs/nanox/nanox-master-0001.patch b/packages/libs/nanox/nanox-master-0001.patch new file mode 100644 index 0000000..50ce345 --- /dev/null +++ b/packages/libs/nanox/nanox-master-0001.patch @@ -0,0 +1,4 @@ +39c39 +< ayu_runtime_t ayu_rt = 3; // FIXME: hard coded, use AYU_RT_OMPSS? +--- +> ayu_runtime_t ayu_rt = AYU_RT_OMPSS;