marcindulak pushed to nwchem (f20). "fix Fedora 23 linking of mpich/openmpi"

[notifications at fedoraproject.org]

From 178531622eff37b1f275b006c2dcc21237305441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
Date: Sun, 3 May 2015 17:48:38 -0400
Subject: fix Fedora 23 linking of mpich/openmpi


diff --git a/nwchem.spec b/nwchem.spec
index 8bfdd51..1dffd02 100644
--- a/nwchem.spec
+++ b/nwchem.spec
@@ -246,10 +246,11 @@ echo export MPIEXEC=$MPI_BIN/mpiexec >> ../compile$MPI_SUFFIX.sh; \
 echo export MPI_LIB=$MPI_LIB >> ../compile$MPI_SUFFIX.sh; \
 echo export MPI_INCLUDE=$MPI_INCLUDE >> ../compile$MPI_SUFFIX.sh; \
 if [ "$MPI_SUFFIX" == "_openmpi" ] && [ -r "$MPI_LIB/libmpi_f90.so" ]; then echo export LIBMPI="'-lmpi -lmpi_f90 -lmpi_f77'" >> ../compile$MPI_SUFFIX.sh; fi; \
-if [ "$MPI_SUFFIX" == "_openmpi" ] && [ -r "$MPI_LIB/libmpi_usempi.so" ]; then echo export LIBMPI="'-lmpi -lmpi_usempi -lmpi_mpifh'" >> ../compile$MPI_SUFFIX.sh; fi; \
-if [ "$MPI_SUFFIX" == "_openmpi" ] && [ -r "$MPI_LIB/libmpi_usempif08.so" ]; then echo export LIBMPI="'-lmpi -lmpi_usempif08 -lmpi_mpifh'" >> ../compile$MPI_SUFFIX.sh; fi; \
+if [ "$MPI_SUFFIX" == "_openmpi" ] && [ -r "$MPI_LIB/libmpi_mpifh.so" ] && [ ! -r "$MPI_LIB/libmpi_usempif08.so" ]; then echo export LIBMPI="'-lmpi -lmpi_usempi -lmpi_mpifh'" >> ../compile$MPI_SUFFIX.sh; fi; \
+if [ "$MPI_SUFFIX" == "_openmpi" ] && [ -r "$MPI_LIB/libmpi_mpifh.so" ] && [ -r "$MPI_LIB/libmpi_usempif08.so" ]; then echo export LIBMPI="'-lmpi -lmpi_usempif08 -lmpi_mpifh'" >> ../compile$MPI_SUFFIX.sh; fi; \
 if [ "$MPI_SUFFIX" == "_mpich2" ]; then echo export LIBMPI='-lmpich' >> ../compile$MPI_SUFFIX.sh; fi; \
-if [ "$MPI_SUFFIX" == "_mpich" ]; then echo export LIBMPI='-lmpich' >> ../compile$MPI_SUFFIX.sh; fi; \
+if [ "$MPI_SUFFIX" == "_mpich" ] && [ -r "$MPI_LIB/libmpifort.so" ]; then echo export LIBMPI="'-lmpich -lmpifort'" >> ../compile$MPI_SUFFIX.sh; fi; \
+if [ "$MPI_SUFFIX" == "_mpich" ] && [ ! -r "$MPI_LIB/libmpifort.so" ]; then echo export LIBMPI='-lmpich' >> ../compile$MPI_SUFFIX.sh; fi; \
 cat ../make.sh >> ../compile$MPI_SUFFIX.sh; \
 %{__sed} -i "s|.log|$MPI_SUFFIX.log|g" ../compile$MPI_SUFFIX.sh; \
 cat ../compile$MPI_SUFFIX.sh; \
@@ -468,6 +469,7 @@ mv QA.orig QA
 %changelog
 * Sun May  3 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 6.5.26243-15.fc22.1
 - Rebuild for changed mpich
+- fix linking of mpich/openmpi
 
 * Mon Mar 30 2015 Marcin Dulak <Marcin.Dulak at gmail.com> - 6.5.26243-15
 - EACCSD, IPCCSD enabled
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nwchem.git/commit/?h=f20&id=178531622eff37b1f275b006c2dcc21237305441