Accepting request 1120240 from multimedia:libs
OBS-URL: https://build.opensuse.org/request/show/1120240 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fftw3?expand=0&rev=59
This commit is contained in:
commit
10f732dd0a
@ -1,9 +1,6 @@
|
||||
<multibuild>
|
||||
<package>standard</package>
|
||||
<package>gnu-hpc</package>
|
||||
<package>gnu-openmpi-hpc</package>
|
||||
<package>gnu-openmpi2-hpc</package>
|
||||
<package>gnu-openmpi3-hpc</package>
|
||||
<package>gnu-openmpi4-hpc</package>
|
||||
<package>gnu-mvapich2-hpc</package>
|
||||
<package>gnu-mpich-hpc</package>
|
||||
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 25 11:53:29 UTC 2023 - Egbert Eich <eich@suse.com>
|
||||
|
||||
- Disable HPC flavors on %ix86
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 23 11:43:32 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
|
||||
|
||||
- Drop support for obsolete openmpi[123]
|
||||
- Prepare support for openmpi5
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 27 08:41:39 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
163
fftw3.spec
163
fftw3.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -63,36 +63,6 @@ ExclusiveArch: do_not_build
|
||||
%bcond_without hpc
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu-openmpi-hpc"
|
||||
%{?DisOMPI1}
|
||||
%global compiler_family gnu
|
||||
%undefine c_f_ver
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 1
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu-openmpi2-hpc"
|
||||
%{?DisOMPI2}
|
||||
%global compiler_family gnu
|
||||
%undefine c_f_ver
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 2
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu-openmpi3-hpc"
|
||||
%{?DisOMPI3}
|
||||
%global compiler_family gnu
|
||||
%undefine c_f_ver
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 3
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu-openmpi4-hpc"
|
||||
%{?DisOMPI4}
|
||||
%global compiler_family gnu
|
||||
@ -103,6 +73,16 @@ ExclusiveArch: do_not_build
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu-openmpi5-hpc"
|
||||
%{?DisOMPI5}
|
||||
%global compiler_family gnu
|
||||
%undefine c_f_ver
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 5
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu-mvapich2-hpc"
|
||||
%global compiler_family gnu
|
||||
%undefine c_f_ver
|
||||
@ -126,26 +106,6 @@ ExclusiveArch: do_not_build
|
||||
%bcond_without hpc
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu7-openmpi-hpc"
|
||||
%{?DisOMPI1}
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 7
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 1
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu7-openmpi3-hpc"
|
||||
%{?DisOMPI3}
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 7
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 3
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu7-openmpi4-hpc"
|
||||
%{?DisOMPI4}
|
||||
%global compiler_family gnu
|
||||
@ -156,6 +116,16 @@ ExclusiveArch: do_not_build
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu7-openmpi5-hpc"
|
||||
%{?DisOMPI5}
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 7
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 5
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu7-mvapich2-hpc"
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 7
|
||||
@ -179,26 +149,6 @@ ExclusiveArch: do_not_build
|
||||
%bcond_without hpc
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu8-openmpi-hpc"
|
||||
%{?DisOMPI1}
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 8
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 1
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu8-openmpi3-hpc"
|
||||
%{?DisOMPI3}
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 8
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 3
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu8-openmpi4-hpc"
|
||||
%{?DisOMPI4}
|
||||
%global compiler_family gnu
|
||||
@ -209,6 +159,16 @@ ExclusiveArch: do_not_build
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu8-openmpi5-hpc"
|
||||
%{?DisOMPI5}
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 8
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 5
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu8-mvapich2-hpc"
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 8
|
||||
@ -232,26 +192,6 @@ ExclusiveArch: do_not_build
|
||||
%bcond_without hpc
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu9-openmpi-hpc"
|
||||
%{?DisOMPI1}
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 9
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 1
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu9-openmpi3-hpc"
|
||||
%{?DisOMPI3}
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 9
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 3
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu9-openmpi4-hpc"
|
||||
%{?DisOMPI4}
|
||||
%global compiler_family gnu
|
||||
@ -262,6 +202,16 @@ ExclusiveArch: do_not_build
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu9-openmpi5-hpc"
|
||||
%{?DisOMPI5}
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 9
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 5
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu9-mvapich2-hpc"
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 9
|
||||
@ -285,26 +235,6 @@ ExclusiveArch: do_not_build
|
||||
%bcond_without hpc
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu10-openmpi-hpc"
|
||||
%{?DisOMPI1}
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 10
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 1
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu10-openmpi3-hpc"
|
||||
%{?DisOMPI3}
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 10
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 3
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu10-openmpi4-hpc"
|
||||
%{?DisOMPI4}
|
||||
%global compiler_family gnu
|
||||
@ -315,6 +245,16 @@ ExclusiveArch: do_not_build
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu10-openmpi5-hpc"
|
||||
%{?DisOMPI5}
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 10
|
||||
%global mpi_flavor openmpi
|
||||
%define mpi_vers 5
|
||||
%bcond_without hpc
|
||||
%bcond_without mpi
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "gnu10-mvapich2-hpc"
|
||||
%global compiler_family gnu
|
||||
%define c_f_ver 10
|
||||
@ -338,6 +278,7 @@ ExclusiveArch: do_not_build
|
||||
%{?with_mpi:%{!?mpi_flavor:%global mpi_flavor openmpi}}
|
||||
%{?with_mpi:%global hpc_module_pname p%{pname}}
|
||||
# needed by the hpc tools
|
||||
ExcludeArch: %ix86
|
||||
%{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?with_mpi:-m {%mpi_flavor}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}}
|
||||
%define package_base %{hpc_install_path_base}
|
||||
%define package_prefix %hpc_prefix
|
||||
|
Loading…
x
Reference in New Issue
Block a user