[ga] here's some bits to fix module load/unload
David Brown
dmlb2000 at fedoraproject.org
Thu Mar 27 22:49:27 UTC 2014
commit 05645a5ad46eb68ae15d7e2903801321fb0d839a
Author: David Brown <david.brown at pnnl.gov>
Date: Thu Mar 27 15:40:45 2014 -0700
here's some bits to fix module load/unload
ga.spec | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/ga.spec b/ga.spec
index 5c6257e..1974f3d 100644
--- a/ga.spec
+++ b/ga.spec
@@ -140,9 +140,17 @@ cd ..
export MPI_COMPILER_NAME=mpich
export GA_CONFIGURE_OPTIONS=""
+%if 0%{?rhel} <= 6
+%{_mpich2_load}
+%else
%{_mpich_load}
+%endif
%doBuild
+%if 0%{?rhel} <= 6
+%{_mpich2_unload}
+%else
%{_mpich_unload}
+%endif
export MPI_COMPILER_NAME=openmpi
export GA_CONFIGURE_OPTIONS="--with-openib"
@@ -158,9 +166,17 @@ cd ..
rm -rf $RPM_BUILD_ROOT
export MPI_COMPILER_NAME=mpich
+%if 0%{?rhel} <= 6
+%{_mpich2_load}
+%else
%{_mpich_load}
+%endif
%doInstall
+%if 0%{?rhel} <= 6
+%{_mpich2_unload}
+%else
%{_mpich_unload}
+%endif
export MPI_COMPILER_NAME=openmpi
%{_openmpi_load}
@@ -175,12 +191,20 @@ dos2unix %{name}-%{ga_version}/COPYRIGHT
%check
%if %{?do_test}0
+%if 0%{?rhel} <= 6
+%{_mpich2_load}
+%else
%{_mpich_load}
+%endif
cd %{name}-%{version}-mpich
make check
cd ..
+%if 0%{?rhel} <= 6
+%{_mpich2_unload}
+%else
%{_mpich_unload}
%endif
+%endif
%clean
rm -rf %{buildroot}
@@ -209,7 +233,7 @@ rm -rf %{buildroot}
%changelog
* Thu Mar 27 2014 David Brown <david.brown at pnnl.gov> - 5.3b-5
-- Parameterize mpich name to cover EPEL
+- Parameterize mpich name and environment loading to cover EPEL
* Thu Mar 27 2014 David Brown <david.brown at pnnl.gov> - 5.3b-4
- Update to include configure option fixes (1081403)
More information about the scm-commits
mailing list