[Ray/el6] work around nested macros for _mpich_load/_mpich2_load
Sebastien Boisvert
sebhtml at fedoraproject.org
Sun Mar 2 15:00:08 UTC 2014
commit 62356ff53547bd313a15b27f0387535312c22981
Author: Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>
Date: Sun Mar 2 09:59:47 2014 -0500
work around nested macros for _mpich_load/_mpich2_load
Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>
Ray.spec | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/Ray.spec b/Ray.spec
index 3073e70..6d5bcef 100644
--- a/Ray.spec
+++ b/Ray.spec
@@ -121,11 +121,20 @@ make clean
%{_openmpi_unload}
%if %useMpich
-%{_%{mpichName}_load}
+ # %{_%{mpichName}_load} does not work
+ %if %mpichName == "mpich"
+ %{_mpich_load}
+ %else
+ %{_mpich2_load}
+ %endif
make CXXFLAGS="$CXXFLAGS" HAVE_LIBBZ2=y HAVE_LIBZ=y
cp %{name} %{name}$MPI_SUFFIX
make clean
-%{_%{mpichName}_unload}
+ %if %mpichName == "mpich"
+ %{_mpich_unload}
+ %else
+ %{_mpich2_unload}
+ %endif
%endif
%install
@@ -143,10 +152,18 @@ install -m 0755 %{name}$MPI_SUFFIX %{buildroot}$MPI_BIN
%if %useMpich
# Ray-mpich
-%{_%{mpichName}_load}
+ %if %mpichName == "mpich"
+ %{_mpich_load}
+ %else
+ %{_mpich2_load}
+ %endif
mkdir -p %{buildroot}$MPI_BIN
install -m 0755 %{name}$MPI_SUFFIX %{buildroot}$MPI_BIN
-%{_%{mpichName}_unload}
+ %if %mpichName == "mpich"
+ %{_mpich_unload}
+ %else
+ %{_mpich2_unload}
+ %endif
%endif
# Ray-doc
More information about the scm-commits
mailing list