Sync with latest Fedora repo

Resolves: rhbz#1972736

Signed-off-by: Honggang Li <honli@redhat.com>
This commit is contained in:
Honggang Li 2021-07-02 03:17:59 -04:00
parent 97d6efe563
commit 162c33412f
3 changed files with 7 additions and 3 deletions

View File

@ -45,7 +45,7 @@ if [ -e /etc/profile.d/modules.sh ]; then
done done
export MODULEPATH="$MODULEPATH:$(IFS=:; echo "${_MODULEPATH[*]}")" export MODULEPATH="$MODULEPATH:$(IFS=:; echo "${_MODULEPATH[*]}")"
for module in $(module -t avail 2>&1 | grep "^mpi/."); do for module in $(module -t avail 2>&1 | grep "^mpi/." | sed "s/(default)$//"); do
module load $module module load $module
mpi_compiler_for_dir[${MPI_HOME}]=${MPI_COMPILER} mpi_compiler_for_dir[${MPI_HOME}]=${MPI_COMPILER}
mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER} mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}

View File

@ -47,7 +47,7 @@ if [ -e /etc/profile.d/modules.sh ]; then
done done
export MODULEPATH="$MODULEPATH:$(IFS=:; echo "${_MODULEPATH[*]}")" export MODULEPATH="$MODULEPATH:$(IFS=:; echo "${_MODULEPATH[*]}")"
for module in $(module -t avail 2>&1 | grep "^mpi/."); do for module in $(module -t avail 2>&1 | grep "^mpi/." | sed "s/(default)$//"); do
module load $module module load $module
mpi_compiler_for_dir[${MPI_HOME}]=${MPI_COMPILER} mpi_compiler_for_dir[${MPI_HOME}]=${MPI_COMPILER}
mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER} mpi_compiler_for_dir[${MPI_FORTRAN_MOD_DIR}]=${MPI_COMPILER}

View File

@ -1,5 +1,5 @@
Name: rpm-mpi-hooks Name: rpm-mpi-hooks
Version: 7 Version: 8
Release: 2%{?dist} Release: 2%{?dist}
Summary: RPM dependency generator hooks for MPI packages Summary: RPM dependency generator hooks for MPI packages
@ -46,6 +46,10 @@ install -Dpm 0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/mpi.req
%changelog %changelog
* Fri Jul 02 2021 Honggang Li <honli@redhat.com> - 8-2
- Sync with latest Fedora repo
- Resolves: rhbz#1972736
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7-2 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937