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

- Disable the openmpi3 flavor in some products.

OBS-URL: https://build.opensuse.org/request/show/563895
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mpiP?expand=0&rev=15
This commit is contained in:
Egbert Eich 2018-01-12 17:07:57 +00:00 committed by Git OBS Bridge
parent d1ed20dc91
commit fd78914cdc
2 changed files with 15 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 12 15:37:28 UTC 2018 - eich@suse.com
- Disable the openmpi3 flavor in some products.
-------------------------------------------------------------------
Fri Jan 5 19:00:01 UTC 2018 - eich@suse.com

View File

@ -22,11 +22,18 @@
%define vers 3.4.1
%define _vers 3_4_1
%if 0%{?is_opensuse} || 0%{?is_backports}
%undefine DisOMPI3
%else
%define DisOMPI3 ExclusiveArch: do_not_build
%endif
%if "%flavor" == ""
ExclusiveArch: do_not_build
%endif
%if "%{flavor}" == "gnu-openmpi-hpc"
%{?DisOMPI1}
%global compiler_family gnu
%undefine c_f_ver
%define mpi_family openmpi
@ -34,6 +41,7 @@ ExclusiveArch: do_not_build
%endif
%if "%{flavor}" == "gnu-openmpi3-hpc"
%{?DisOMPI3}
%global compiler_family gnu
%undefine c_f_ver
%define mpi_family openmpi
@ -53,6 +61,7 @@ ExclusiveArch: do_not_build
%endif
%if "%{flavor}" == "gnu7-openmpi-hpc"
%{?DisOMPI1}
%global compiler_family gnu
%define c_f_ver 7
%define mpi_family openmpi
@ -60,6 +69,7 @@ ExclusiveArch: do_not_build
%endif
%if "%{flavor}" == "gnu7-openmpi3-hpc"
%{?DisOMPI3}
%global compiler_family gnu
%define c_f_ver 7
%define mpi_family openmpi