diff --git a/_multibuild b/_multibuild index ca7908e..5a9261d 100644 --- a/_multibuild +++ b/_multibuild @@ -3,10 +3,12 @@ openmpi1 openmpi2 openmpi3 + openmpi4 mvapich2 gnu-openmpi-hpc gnu-openmpi2-hpc gnu-openmpi3-hpc + gnu-openmpi4-hpc gnu-mvapich2-hpc gnu-mpich-hpc gnu-hpc diff --git a/hdf5.changes b/hdf5.changes index 7e38692..2552a3c 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 24 07:32:58 UTC 2020 - Alin M Elena + +- add openmpi4 packages to build and disable build for leap + ------------------------------------------------------------------- Fri Apr 17 14:54:44 UTC 2020 - Egbert Eich diff --git a/hdf5.spec b/hdf5.spec index c90d761..a7a8af9 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -25,6 +25,10 @@ %define DisOMPI3 ExclusiveArch: do_not_build %endif +%if 0%{?sle_version:1} && 0%{?sle_version} < 150300 +%define DisOMPI4 ExclusiveArch: do_not_build +%endif + # Disable until resource issue is resolved. %bcond_with check @@ -67,6 +71,13 @@ ExclusiveArch: do_not_build %bcond_with hpc %endif +%if "%{flavor}" == "openmpi4" +%{?DisOMPI4} +%global mpi_flavor openmpi +%define mpi_vers 4 +%bcond_with hpc +%endif + %if "%{flavor}" == "mvapich2" %global mpi_flavor %{flavor} %bcond_with hpc @@ -112,6 +123,15 @@ ExclusiveArch: do_not_build %define mpi_vers 3 %endif +%if "%{flavor}" == "gnu-openmpi4-hpc" +%{?DisOMPI4} +%bcond_without hpc +%define compiler_family gnu +%undefine c_f_ver +%global mpi_flavor openmpi +%define mpi_vers 4 +%endif + %if "%{flavor}" == "gnu-mpich-hpc" %bcond_without hpc %define compiler_family gnu