From cf252330e0d58366d47ecc68fa7048d01377c154 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 23 Jun 2014 14:00:27 +0200 Subject: [PATCH 1/2] Modules.build: set USE_INTERP_ERRORLINE, otherwise it will not compile with tcl 8.6 --- scripts/Modules.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Modules.build b/scripts/Modules.build index ab0605b..9db29cf 100755 --- a/scripts/Modules.build +++ b/scripts/Modules.build @@ -5,7 +5,7 @@ source "$(dirname $0)/../lib/libem.bash" function em.configure() { - "${EM_SRCDIR}"/configure \ + CPPFLAGS="-DUSE_INTERP_ERRORLINE" "${EM_SRCDIR}"/configure \ --prefix="${EM_BINDIR}/${EM_FAMILY}" \ --with-module-path="${MODULEPATH_ROOT}" \ || exit 1 From d4fe0f59bda68416fbfd3e38989a5d47d7b26f53 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 23 Jun 2014 14:01:38 +0200 Subject: [PATCH 2/2] libem.bash: purge modules only if module is available --- lib/libem.bash | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libem.bash b/lib/libem.bash index 475e24c..26a37f3 100644 --- a/lib/libem.bash +++ b/lib/libem.bash @@ -152,7 +152,9 @@ declare -x LIBRARY_PATH declare -x LD_LIBRARY_PATH declare -x DYLD_LIBRARY_PATH -module purge +if typeset -f module > /dev/null 2>&1 ; then + module purge +fi if [[ $DEBUG_ON ]]; then trap 'echo "$BASH_COMMAND"' DEBUG