Use new mpi module location
This commit is contained in:
parent
63dd85c99a
commit
b8c2f95f78
@ -201,7 +201,7 @@ for mpi in %{mpi_list}
|
|||||||
do
|
do
|
||||||
mkdir $mpi
|
mkdir $mpi
|
||||||
pushd $mpi
|
pushd $mpi
|
||||||
module load $mpi-%{_arch}
|
module load mpi/$mpi-%{_arch}
|
||||||
ln -s ../configure .
|
ln -s ../configure .
|
||||||
%configure %{configure_opts} \
|
%configure %{configure_opts} \
|
||||||
--libdir=%{_libdir}/$mpi/lib \
|
--libdir=%{_libdir}/$mpi/lib \
|
||||||
@ -224,7 +224,7 @@ chrpath --delete ${RPM_BUILD_ROOT}/%{_bindir}/nc{copy,dump,gen,gen3}
|
|||||||
/bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
|
/bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
|
||||||
for mpi in %{mpi_list}
|
for mpi in %{mpi_list}
|
||||||
do
|
do
|
||||||
module load $mpi-%{_arch}
|
module load mpi/$mpi-%{_arch}
|
||||||
make -C $mpi install DESTDIR=${RPM_BUILD_ROOT}
|
make -C $mpi install DESTDIR=${RPM_BUILD_ROOT}
|
||||||
rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.la
|
rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.la
|
||||||
chrpath --delete ${RPM_BUILD_ROOT}/%{_libdir}/$mpi/bin/nc{copy,dump,gen,gen3}
|
chrpath --delete ${RPM_BUILD_ROOT}/%{_libdir}/$mpi/bin/nc{copy,dump,gen,gen3}
|
||||||
@ -237,7 +237,7 @@ done
|
|||||||
make -C build check
|
make -C build check
|
||||||
for mpi in %{mpi_list}
|
for mpi in %{mpi_list}
|
||||||
do
|
do
|
||||||
module load $mpi-%{_arch}
|
module load mpi/$mpi-%{_arch}
|
||||||
make -C $mpi check
|
make -C $mpi check
|
||||||
module purge
|
module purge
|
||||||
done
|
done
|
||||||
@ -319,6 +319,7 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%changelog
|
%changelog
|
||||||
* Thu Nov 1 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2.1.1-2
|
* Thu Nov 1 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2.1.1-2
|
||||||
- Rebuild for openmpi and mpich2 soname bumps
|
- Rebuild for openmpi and mpich2 soname bumps
|
||||||
|
- Use new mpi module location
|
||||||
|
|
||||||
* Fri Aug 3 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2.1.1-1
|
* Fri Aug 3 2012 Orion Poplawski <orion@cora.nwra.com> - 4.2.1.1-1
|
||||||
- Update to 4.2.1.1
|
- Update to 4.2.1.1
|
||||||
|
Loading…
Reference in New Issue
Block a user