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

- Disable the openmpi3 flavor in some products.

OBS-URL: https://build.opensuse.org/request/show/563894
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=60
This commit is contained in:
Egbert Eich 2018-01-12 17:06:45 +00:00 committed by Git OBS Bridge
parent ebc6475ddd
commit 696f74178a
2 changed files with 15 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 12 15:38:59 UTC 2018 - eich@suse.com
- Disable the openmpi3 flavor in some products.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 5 18:34:20 UTC 2018 - eich@suse.com Fri Jan 5 18:34:20 UTC 2018 - eich@suse.com

View File

@ -18,6 +18,12 @@
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%if 0%{?is_opensuse} || 0%{?is_backports}
%undefine DisOMPI3
%else
%define DisOMPI3 ExclusiveArch: do_not_build
%endif
# #
%define _do_check 1 %define _do_check 1
%define use_sz2 0 %define use_sz2 0
@ -58,6 +64,7 @@ ExclusiveArch: do_not_build
%endif %endif
%if "%{flavor}" == "gnu-openmpi-hpc" %if "%{flavor}" == "gnu-openmpi-hpc"
%{?DisOMPI1}
%bcond_without hpc %bcond_without hpc
%define compiler_family gnu %define compiler_family gnu
%undefine c_f_ver %undefine c_f_ver
@ -73,6 +80,7 @@ ExclusiveArch: do_not_build
%endif %endif
%if "%{flavor}" == "gnu-openmpi3-hpc" %if "%{flavor}" == "gnu-openmpi3-hpc"
%{?DisOMPI3}
%bcond_without hpc %bcond_without hpc
%define compiler_family gnu %define compiler_family gnu
%undefine c_f_ver %undefine c_f_ver
@ -95,6 +103,7 @@ ExclusiveArch: do_not_build
%endif %endif
%if "%{flavor}" == "gnu7-openmpi-hpc" %if "%{flavor}" == "gnu7-openmpi-hpc"
%{?DisOMPI1}
%bcond_without hpc %bcond_without hpc
%define compiler_family gnu %define compiler_family gnu
%define c_f_ver 7 %define c_f_ver 7
@ -110,6 +119,7 @@ ExclusiveArch: do_not_build
%endif %endif
%if "%{flavor}" == "gnu7-openmpi3-hpc" %if "%{flavor}" == "gnu7-openmpi3-hpc"
%{?DisOMPI3}
%bcond_without hpc %bcond_without hpc
%define compiler_family gnu %define compiler_family gnu
%define c_f_ver 7 %define c_f_ver 7