Allow for no MPI_PYTHON{2}_SITEARCH

This commit is contained in:
Orion Poplawski 2019-11-15 17:07:43 -07:00
parent 1e4935273d
commit 69593b3c97
3 changed files with 6 additions and 3 deletions

View File

@ -52,7 +52,7 @@ if [ -e /etc/profile.d/modules.sh ]; then
mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER} mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}
if [ -n "${MPI_PYTHON2_SITEARCH}" ]; then if [ -n "${MPI_PYTHON2_SITEARCH}" ]; then
mpi_compiler_for_dir[${MPI_PYTHON2_SITEARCH}]=${MPI_COMPILER} mpi_compiler_for_dir[${MPI_PYTHON2_SITEARCH}]=${MPI_COMPILER}
else elif [ -n "${MPI_PYTHON_SITEARCH}" ]; then
mpi_compiler_for_dir[${MPI_PYTHON_SITEARCH}]=${MPI_COMPILER} mpi_compiler_for_dir[${MPI_PYTHON_SITEARCH}]=${MPI_COMPILER}
fi fi
if [ -n "${MPI_PYTHON3_SITEARCH}" ]; then if [ -n "${MPI_PYTHON3_SITEARCH}" ]; then

View File

@ -54,7 +54,7 @@ if [ -e /etc/profile.d/modules.sh ]; then
mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER} mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}
if [ -n "${MPI_PYTHON2_SITEARCH}" ]; then if [ -n "${MPI_PYTHON2_SITEARCH}" ]; then
mpi_compiler_for_dir[${MPI_PYTHON2_SITEARCH}]=${MPI_COMPILER} mpi_compiler_for_dir[${MPI_PYTHON2_SITEARCH}]=${MPI_COMPILER}
else elif [ -n "${MPI_PYTHON_SITEARCH}" ]; then
mpi_compiler_for_dir[${MPI_PYTHON_SITEARCH}]=${MPI_COMPILER} mpi_compiler_for_dir[${MPI_PYTHON_SITEARCH}]=${MPI_COMPILER}
fi fi
if [ -n "${MPI_PYTHON3_SITEARCH}" ]; then if [ -n "${MPI_PYTHON3_SITEARCH}" ]; then

View File

@ -1,6 +1,6 @@
Name: rpm-mpi-hooks Name: rpm-mpi-hooks
Version: 6 Version: 6
Release: 3%{?dist} Release: 4%{?dist}
Summary: RPM dependency generator hooks for MPI packages Summary: RPM dependency generator hooks for MPI packages
License: MIT License: MIT
@ -46,6 +46,9 @@ install -Dpm 0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/mpi.req
%changelog %changelog
* Fri Nov 15 2019 Orion Poplawski <orion@nwra.com> - 6-4
- Allow for no MPI_PYTHON{2}_SITEARCH
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6-3 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild