diff --git a/_multibuild b/_multibuild index 91efebd..65adc9e 100644 --- a/_multibuild +++ b/_multibuild @@ -3,6 +3,7 @@ openmpi1 openmpi2 openmpi3 + openmpi4 mvapich2 scotch-serial scotch-openmpi1 @@ -10,6 +11,7 @@ gnu-openmpi-hpc gnu-openmpi2-hpc gnu-openmpi3-hpc + gnu-openmpi4-hpc gnu-mvapich2-hpc gnu-mpich-hpc diff --git a/mumps.changes b/mumps.changes index e2afa4a..d189e74 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 5 20:31:13 UTC 2021 - Egbert Eich + +- Disable openmpi4 builds for SLE/Leap < 15.3. + ------------------------------------------------------------------- Thu Jan 28 17:52:27 UTC 2021 - Egbert Eich diff --git a/mumps.spec b/mumps.spec index ac85012..947562a 100644 --- a/mumps.spec +++ b/mumps.spec @@ -38,6 +38,9 @@ ExclusiveArch: do_not_build %if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 %define DisOMPI3 ExclusiveArch: do_not_build %endif +%if 0%{?sle_version:1} && 0%{?sle_version} < 150300 +%define DisOMPI4 ExclusiveArch: do_not_build +%endif %if "%{flavor}" == "serial" # Stub MPI library @@ -61,6 +64,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "openmpi2" +%{?DisOMPI2} %define mpi_family openmpi %define mumps_f77_mpilibs -lmpi_mpifh -lmpi %define mpi_ver 2 @@ -68,6 +72,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "openmpi3" +%{?DisOMPI3} %define mpi_family openmpi %define mumps_f77_mpilibs -lmpi_mpifh -lmpi %define mpi_ver 3 @@ -75,6 +80,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "openmpi4" +%{?DisOMPI4} %define mpi_family openmpi %define mumps_f77_mpilibs -lmpi_mpifh -lmpi %define mpi_ver 4 @@ -97,6 +103,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "scotch-openmpi2" +%{?DisOMPI2} %define mpi_family openmpi %define mpi_ver 2 %define mumps_f77_mpilibs -lmpi_mpifh -lmpi @@ -105,6 +112,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "scotch-openmpi3" +%{?DisOMPI3} %define mpi_family openmpi %define mpi_ver 3 %define mumps_f77_mpilibs -lmpi_mpifh -lmpi @@ -113,6 +121,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "scotch-openmpi4" +%{?DisOMPI4} %define mpi_family openmpi %define mpi_ver 4 %define mumps_f77_mpilibs -lmpi_mpifh -lmpi @@ -158,7 +167,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu-openmpi4-hpc" -%{?DisOMPI3} +%{?DisOMPI4} %undefine c_f_ver # macro mpi is used by macros for master package %global mpi_family openmpi @@ -213,7 +222,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu7-openmpi4-hpc" -%{?DisOMPI3} +%{?DisOMPI4} %define c_f_ver 7 # macro mpi is used by macros for master package %global mpi_family openmpi @@ -268,7 +277,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu8-openmpi4-hpc" -%{?DisOMPI3} +%{?DisOMPI4} %define c_f_ver 8 # macro mpi is used by macros for master package %global mpi_family openmpi @@ -323,7 +332,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu9-openmpi4-hpc" -%{?DisOMPI3} +%{?DisOMPI4} %define c_f_ver 9 # macro mpi is used by macros for master package %global mpi_family openmpi @@ -378,7 +387,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu10-openmpi4-hpc" -%{?DisOMPI3} +%{?DisOMPI4} %define c_f_ver 10 # macro mpi is used by macros for master package %global mpi_family openmpi