From ec7f7f4df9fab20278a20cd954a57513e467636a Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Wed, 12 Aug 2015 08:59:15 +0100 Subject: [PATCH] Porting updates --- ThirdParty/AllMake.stage2 | 2 +- etc/prefs.csh-EXAMPLE | 2 +- etc/prefs.sh-EXAMPLE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ThirdParty/AllMake.stage2 b/ThirdParty/AllMake.stage2 index 9b53ee6f3..44613e46c 100755 --- a/ThirdParty/AllMake.stage2 +++ b/ThirdParty/AllMake.stage2 @@ -102,7 +102,7 @@ then [ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_188" ] && { echo "Building openmpi 1.8.8" ( rpm_make -p openmpi-1.8.8 -s openmpi-1.8.8.spec -u http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.8.tar.gz \ - -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs"') + -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_188_ConfigureAdditionalArgs"') } else echo "Using system installed OpenMPI" diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE index b029715bd..53aa16d49 100644 --- a/etc/prefs.csh-EXAMPLE +++ b/etc/prefs.csh-EXAMPLE @@ -203,7 +203,7 @@ setenv WM_THIRD_PARTY_USE_CMAKE_322 1 # # For AllMake.stage2 setenv WM_THIRD_PARTY_USE_OPENMPI_188 1 -setenv WM_THIRD_PARTY_USE_OPENMPI_188_ConfigureAdditionalArgs '--enable-mpi-cxx --with-verbs=/usr --with-verbs-libdir=/usr/lib64' +#setenv WM_THIRD_PARTY_USE_OPENMPI_188_ConfigureAdditionalArgs '--enable-mpi-cxx --with-verbs=/usr --with-verbs-libdir=/usr/lib64' #setenv WM_THIRD_PARTY_USE_OPENMPI_165 1 #setenv WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs '--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64' #setenv WM_THIRD_PARTY_USE_OPENMPI_15 1 diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE index b1d56f921..a6897d035 100644 --- a/etc/prefs.sh-EXAMPLE +++ b/etc/prefs.sh-EXAMPLE @@ -213,7 +213,7 @@ export WM_THIRD_PARTY_USE_CMAKE_322=1 # # For AllMake.stage2 export WM_THIRD_PARTY_USE_OPENMPI_188=1 -export WM_THIRD_PARTY_USE_OPENMPI_188_ConfigureAdditionalArgs='--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64' +#export WM_THIRD_PARTY_USE_OPENMPI_188_ConfigureAdditionalArgs='--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64' #export WM_THIRD_PARTY_USE_OPENMPI_165=1 #export WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs='--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64' #export WM_THIRD_PARTY_USE_OPENMPI_15=1