diff options
| author | eschnett <eschnett@043a8217-7a68-40fe-abfd-36aa7d4fa6a8> | 2013-02-25 18:29:43 +0000 |
|---|---|---|
| committer | eschnett <eschnett@043a8217-7a68-40fe-abfd-36aa7d4fa6a8> | 2013-02-25 18:29:43 +0000 |
| commit | 1b3c16cef7d82d652c02e443198bf2f3d367a996 (patch) | |
| tree | cd5df5e342d647fb00597468ee42e1b0aa4f8771 | |
| parent | 85983c7d179cf5731032c30088505c580a12cc4f (diff) | |
Correct string concatenation
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/MPI/trunk@17 043a8217-7a68-40fe-abfd-36aa7d4fa6a8
| -rwxr-xr-x | configure.sh | 1 | ||||
| -rw-r--r-- | dist/default_outfile.patch | 33 |
2 files changed, 34 insertions, 0 deletions
diff --git a/configure.sh b/configure.sh index 166086d..25d177d 100755 --- a/configure.sh +++ b/configure.sh @@ -149,6 +149,7 @@ then echo "MPI: Unpacking archive..." pushd ${BUILD_DIR} ${TAR?} xzf ${SRCDIR}/dist/${NAME}.tar.gz + ${PATCH?} -p0 < ${SRCDIR}/dist/default_outfile.patch echo "MPI: Configuring..." cd ${NAME} diff --git a/dist/default_outfile.patch b/dist/default_outfile.patch new file mode 100644 index 0000000..baf794c --- /dev/null +++ b/dist/default_outfile.patch @@ -0,0 +1,33 @@ +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 +@@ -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 -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 +@@ -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 ) { |