diff options
| author | eschnett <eschnett@043a8217-7a68-40fe-abfd-36aa7d4fa6a8> | 2013-07-04 20:43:13 +0000 |
|---|---|---|
| committer | eschnett <eschnett@043a8217-7a68-40fe-abfd-36aa7d4fa6a8> | 2013-07-04 20:43:13 +0000 |
| commit | 293b97e8d167876de31e695ecb32d260b506a1e0 (patch) | |
| tree | 12bc1c40b9f0d86395f75f06b2840db45e9a5f23 | |
| parent | b62437307dd69398139ee33eead6b4e5030d4f1c (diff) | |
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/MPI/trunk@35 043a8217-7a68-40fe-abfd-36aa7d4fa6a8
| -rwxr-xr-x | configure.sh | 5 | ||||
| -rw-r--r-- | dist/default_outfile-1.6.5.patch (renamed from dist/default_outfile.patch) | 12 | ||||
| -rw-r--r-- | dist/openmpi-1.6.5.tar.gz (renamed from dist/openmpi-1.6.4.tar.gz) | bin | 15478766 -> 15513056 bytes |
3 files changed, 9 insertions, 8 deletions
diff --git a/configure.sh b/configure.sh index 1738d9b..8c5e0c5 100755 --- a/configure.sh +++ b/configure.sh @@ -87,7 +87,8 @@ then # Set locations THORN=MPI - NAME=openmpi-1.6.4 + NAME=openmpi-1.6.5 + #NAME=openmpi-1.7.1 SRCDIR=$(dirname $0) BUILD_DIR=${SCRATCH_BUILD}/build/${THORN} if [ -z "${MPI_INSTALL_DIR}"]; then @@ -153,7 +154,7 @@ then echo "MPI: Unpacking archive..." pushd ${BUILD_DIR} ${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz - ${PATCH?} -p0 < ${SRCDIR}/dist/default_outfile.patch + ${PATCH?} -p0 < ${SRCDIR}/dist/default_outfile-1.6.5.patch echo "MPI: Configuring..." cd ${NAME} diff --git a/dist/default_outfile.patch b/dist/default_outfile-1.6.5.patch index baf794c..539fee7 100644 --- a/dist/default_outfile.patch +++ b/dist/default_outfile-1.6.5.patch @@ -1,6 +1,6 @@ -diff -ru openmpi-1.6.4.orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp openmpi-1.6.4/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp ---- openmpi-1.6.4.orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp 2012-07-27 07:41:17.000000000 -0400 -+++ openmpi-1.6.4/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp 2013-02-25 12:59:21.000000000 -0500 +diff -ru openmpi-1.6.5.orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp openmpi-1.6.5/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp +--- openmpi-1.6.5.orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp 2012-07-27 07:41:17.000000000 -0400 ++++ openmpi-1.6.5/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp 2013-02-25 12:59:21.000000000 -0500 @@ -54,7 +54,7 @@ " -V show OTF version \n", " -i <file> input file name \n", @@ -10,9 +10,9 @@ diff -ru openmpi-1.6.4.orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshr " -l \"<list>\" a list of processes in quotes \n", " to enable, i.e. keep in the copy, \n", " e.g. '-l \"1,2 4-8 3\",10 12-20' \n", -diff -ru openmpi-1.6.4.orig/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c openmpi-1.6.4/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c ---- openmpi-1.6.4.orig/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c 2012-07-27 07:41:20.000000000 -0400 -+++ openmpi-1.6.4/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c 2013-02-25 13:00:03.000000000 -0500 +diff -ru openmpi-1.6.5.orig/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c openmpi-1.6.5/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c +--- openmpi-1.6.5.orig/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c 2012-07-27 07:41:20.000000000 -0400 ++++ openmpi-1.6.5/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c 2013-02-25 13:00:03.000000000 -0500 @@ -41,7 +41,7 @@ " -h, --help show this help message \n", " -V show OTF version \n", diff --git a/dist/openmpi-1.6.4.tar.gz b/dist/openmpi-1.6.5.tar.gz Binary files differindex 461cfd3..627e346 100644 --- a/dist/openmpi-1.6.4.tar.gz +++ b/dist/openmpi-1.6.5.tar.gz |