Update to OpenMPI 1.6.4

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/MPI/trunk@16 043a8217-7a68-40fe-abfd-36aa7d4fa6a8

3 files changed, 1 insertions, 36 deletions

diff --git a/configure.sh b/configure.sh
index 8c567c1..166086d 100755
--- a/configure.sh
+++ b/configure.sh
@@ -83,7 +83,7 @@ then
     
     # Set locations
     THORN=MPI
-    NAME=openmpi-1.6.3
+    NAME=openmpi-1.6.4
     SRCDIR=$(dirname $0)
     BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
     if [ -z "${MPI_INSTALL_DIR}"]; then
@@ -149,7 +149,6 @@ then
         echo "MPI: Unpacking archive..."
         pushd ${BUILD_DIR}
         ${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz
-        ${PATCH?} -p0 < ${SRCDIR}/dist/default_outfile.diff
         
         echo "MPI: Configuring..."
         cd ${NAME}
@@ -167,7 +166,6 @@ then
         
         date > ${DONE_FILE}
         echo "MPI: Done."
-        
         )
         
         if (( $? )); then
diff --git a/dist/default_outfile.diff b/dist/default_outfile.diff
deleted file mode 100644
index c45e226..0000000
--- a/dist/default_outfile.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -u -r openmpi-1.6.3.orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp openmpi-1.6.3/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp
---- openmpi-1.6.3.orig/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp	2012-10-31 14:07:12.000000000 -0400
-+++ openmpi-1.6.3/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp	2012-10-31 14:08:23.000000000 -0400
-@@ -54,7 +54,7 @@
- "      -V            show OTF version                                       \n",
- "      -i <file>     input file name                                        \n",
- "      -o <name>     namestub of the output file                            \n",
--"                    (default: "DEFAULT_OUTFILE")                           \n",
-+"                    (default: " DEFAULT_OUTFILE ")                         \n",
- "      -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 -u -r openmpi-1.6.3.orig/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c openmpi-1.6.3/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c
---- openmpi-1.6.3.orig/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c	2012-10-31 14:07:12.000000000 -0400
-+++ openmpi-1.6.3/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c	2012-10-31 14:08:16.000000000 -0400
-@@ -41,7 +41,7 @@
- "      -h, --help    show this help message                                 \n",
- "      -V            show OTF version                                       \n",
- "      -o <file>     namestub of the output file                            \n",
--"                    (default: "DEFAULT_OUTFILE")                           \n",
-+"                    (default: " DEFAULT_OUTFILE ")                         \n",
- "      -f <n>        max count of filehandles                               \n",
- "                    (default: 100)                                         \n",
- "      -n <n>        output stream count                                    \n",
-@@ -167,7 +167,7 @@
- 		printf( " no output file specified\n" );
- 		exit(1);
- 		*/
--		outputFile= strdup( DEFAULT_OUTFILE".otf" );
-+		outputFile= strdup( DEFAULT_OUTFILE ".otf" );
- 	}
- 
- 	if ( maxfilehandles < 1 ) {
diff --git a/dist/openmpi-1.6.3.tar.gz b/dist/openmpi-1.6.4.tar.gz
index 8328e2c..461cfd3 100644
--- a/dist/openmpi-1.6.3.tar.gz
+++ b/dist/openmpi-1.6.4.tar.gz