Accepting request 1119895 from home:NMorey:branches:science

- Drop support for obsolete openmpi[123]
- Prepare support for openmpi5

OBS-URL: https://build.opensuse.org/request/show/1119895
OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=185
This commit is contained in:
Ana Guerrero 2023-11-02 08:58:03 +00:00 committed by Git OBS Bridge
parent 01be923380
commit a26a99f19f
3 changed files with 13 additions and 15 deletions

View File

@ -1,5 +1,3 @@
<multibuild> <multibuild>
<package>openmpi2</package>
<package>openmpi3</package>
<package>openmpi4</package> <package>openmpi4</package>
</multibuild> </multibuild>

View File

@ -3,6 +3,12 @@ Tue Oct 31 22:56:50 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Build with java source and target levels 8 - Build with java source and target levels 8
-------------------------------------------------------------------
Tue Oct 24 08:06:01 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
- Drop support for obsolete openmpi[123]
- Prepare support for openmpi5
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 4 08:52:20 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de> Tue Apr 4 08:52:20 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -58,19 +58,6 @@
%define my_datadir %_datadir %define my_datadir %_datadir
%endif %endif
%if "%{flavor}" == "openmpi2"
%define my_suffix -openmpi2
%define mpi_flavor openmpi2
%define mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor}
%endif
%if "%{flavor}" == "openmpi3"
%{?DisOMPI3}
%define my_suffix -openmpi3
%define mpi_flavor openmpi3
%define mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor}
%endif
%if "%{flavor}" == "openmpi4" %if "%{flavor}" == "openmpi4"
%{?DisOMPI4} %{?DisOMPI4}
%define my_suffix -openmpi4 %define my_suffix -openmpi4
@ -78,6 +65,13 @@
%define mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor} %define mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor}
%endif %endif
%if "%{flavor}" == "openmpi5"
%{?DisOMPI5}
%define my_suffix -openmpi5
%define mpi_flavor openmpi5
%define mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor}
%endif
%{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}} %{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}}
%if %{with mpi} %if %{with mpi}