From b8c2f95f788de6a6f18aa01fa7c67fcb3a9b6534 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Nov 01 2012 20:18:03 +0000 Subject: Use new mpi module location --- diff --git a/netcdf.spec b/netcdf.spec index e6f10ed..8ae5fdc 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -201,7 +201,7 @@ for mpi in %{mpi_list} do mkdir $mpi pushd $mpi - module load $mpi-%{_arch} + module load mpi/$mpi-%{_arch} ln -s ../configure . %configure %{configure_opts} \ --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 for mpi in %{mpi_list} do - module load $mpi-%{_arch} + module load mpi/$mpi-%{_arch} make -C $mpi install DESTDIR=${RPM_BUILD_ROOT} rm $RPM_BUILD_ROOT/%{_libdir}/$mpi/lib/*.la chrpath --delete ${RPM_BUILD_ROOT}/%{_libdir}/$mpi/bin/nc{copy,dump,gen,gen3} @@ -237,7 +237,7 @@ done make -C build check for mpi in %{mpi_list} do - module load $mpi-%{_arch} + module load mpi/$mpi-%{_arch} make -C $mpi check module purge done @@ -319,6 +319,7 @@ rm -rf ${RPM_BUILD_ROOT} %changelog * Thu Nov 1 2012 Orion Poplawski - 4.2.1.1-2 - Rebuild for openmpi and mpich2 soname bumps +- Use new mpi module location * Fri Aug 3 2012 Orion Poplawski - 4.2.1.1-1 - Update to 4.2.1.1