Accepting request 563893 from home:eeich:branches:fix-compilers-hpc

- Disable the openmpi3 flavor in some products.

OBS-URL: https://build.opensuse.org/request/show/563893
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=58
This commit is contained in:
Takashi Iwai 2018-01-15 12:39:39 +00:00 committed by Git OBS Bridge
parent 44f8d46b33
commit 2aa722a452
2 changed files with 15 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 12 15:33:40 UTC 2018 - eich@suse.com
- Disable the openmpi3 flavor in some products.
-------------------------------------------------------------------
Fri Jan 5 18:32:30 UTC 2018 - eich@suse.com

View File

@ -27,6 +27,12 @@
%bcond_with ringdisabled
%if 0%{?is_opensuse} || 0%{?is_backports}
%undefine DisOMPI3
%else
%define DisOMPI3 ExclusiveArch: do_not_build
%endif
%if "%flavor" == ""
ExclusiveArch: do_not_build
%define package_name %pname
@ -55,6 +61,7 @@ ExclusiveArch: do_not_build
%endif
%if "%{flavor}" == "gnu-openmpi-hpc"
%{?DisOMPI1}
%global compiler_family gnu
%undefine c_f_ver
%global mpi_flavor openmpi
@ -64,6 +71,7 @@ ExclusiveArch: do_not_build
%endif
%if "%{flavor}" == "gnu-openmpi3-hpc"
%{?DisOMPI3}
%global compiler_family gnu
%undefine c_f_ver
%global mpi_flavor openmpi
@ -96,6 +104,7 @@ ExclusiveArch: do_not_build
%endif
%if "%{flavor}" == "gnu7-openmpi-hpc"
%{?DisOMPI1}
%global compiler_family gnu
%define c_f_ver 7
%global mpi_flavor openmpi
@ -105,6 +114,7 @@ ExclusiveArch: do_not_build
%endif
%if "%{flavor}" == "gnu7-openmpi3-hpc"
%{?DisOMPI3}
%global compiler_family gnu
%define c_f_ver 7
%global mpi_flavor openmpi