Merge pull request #3420 from cms-sw/openmpi-sherpa224-backport-93x

backported openmpi and share changes in to 93X

openmpi-toolfile.spec

@@ -10,6 +10,7 @@ mkdir -p %i/etc/scram.d
 cat << \EOF_TOOLFILE >%i/etc/scram.d/openmpi.xml
 <tool name="openmpi" version="@TOOL_VERSION@">
 <lib name="mpi"/>
+<lib name="mpi_cxx"/>
 <client>
 <environment name="OPENMPI_BASE" default="@TOOL_ROOT@"/>
 <environment name="LIBDIR" default="$OPENMPI_BASE/lib"/>

openmpi.spec

@@ -1,4 +1,5 @@
-### RPM external openmpi 2.1.1
+### RPM external openmpi 2.1.2rc4
+## INITENV SET OPAL_PREFIX %{i}
 Source: http://www.open-mpi.org/software/ompi/v2.1/downloads/%{n}-%{realversion}.tar.gz 
 Patch1: openmpi-2.1.1-disable-lsf-support
 BuildRequires: autotools
@@ -10,7 +11,7 @@ sed -i -e 's|#!/usr/bin/perl|#!/usr/bin/env perl|' opal/asm/generate-all-asm.pl
 sed -i -e 's|/usr/bin/perl|/usr/bin/env perl|' ./Doxyfile
 sed -i -e 's|/usr/bin/perl|/usr/bin/env perl|' ./orte/Doxyfile
 ./autogen.pl --force
-./configure --prefix=%i --without-lsf --disable-libnuma
+./configure --prefix=%i --without-lsf --disable-libnuma --enable-mpi-cxx
 
 %build
 make %{makeprocesses} 

sherpa.spec

@@ -1,5 +1,5 @@
-### RPM external sherpa 2.2.2
-%define tag 337787e09a2cc4bb6a68fd165f3f87f80631e0a0
+### RPM external sherpa 2.2.4
+%define tag 39e6e46da14c4ad12be4894e7acb952ea4087717
 %define branch cms/v%realversion
 %define github_user cms-externals
 Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
@@ -42,13 +42,15 @@ esac
             --enable-blackhat=$BLACKHAT_ROOT \
             --enable-pyext \
             --enable-ufo \
-            ${OPENLOOPS_ROOT+--enable-openloops=$OPENLOOPS_ROOT}\
-            --enable-mpi=$OPENMPI_ROOT \
+            ${OPENLOOPS_ROOT+--enable-openloops=$OPENLOOPS_ROOT} \
+            --enable-mpi \
             --with-sqlite3=$SQLITE_ROOT \
-            CXX="g++" \
-            MPICXX="${OPENMPI_ROOT}/bin/mpic++" \
-            CXXFLAGS="-fuse-cxa-atexit $ARCH_CMSPLATF -O2 -std=c++0x -I$LHAPDF_ROOT/include -I$BLACKHAT_ROOT/include -I$OPENSSL_ROOT/include -I$OPENMPI_ROOT/include/" \
-            LDFLAGS="-ldl -L$BLACKHAT_ROOT/lib/blackhat -L$QD_ROOT/lib -L$OPENSSL_ROOT/lib -L$OPENMPI_ROOT/lib/"
+            CC="mpicc" \
+            CXX="mpicxx" \
+            MPICXX="mpicxx" \
+            FC="mpifort" \
+            CXXFLAGS="-fuse-cxa-atexit $ARCH_CMSPLATF -O2 -std=c++0x -I$LHAPDF_ROOT/include -I$BLACKHAT_ROOT/include -I$OPENSSL_ROOT/include" \
+            LDFLAGS="-ldl -L$BLACKHAT_ROOT/lib/blackhat -L$QD_ROOT/lib -L$OPENSSL_ROOT/lib"
 
 make %{makeprocesses}