Accepting request 752488 from science

- Add support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8609).

- Disable openmpi1 builds for SLE/Leap > 15.1.
- Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773).

OBS-URL: https://build.opensuse.org/request/show/752488
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hdf5?expand=0&rev=62
This commit is contained in:
Dominique Leuenberger 2019-12-02 10:29:11 +00:00 committed by Git OBS Bridge
commit f7b35c6d91
2 changed files with 119 additions and 6 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Nov 28 18:13:10 UTC 2019 - Egbert Eich <eich@suse.com>
- Add support for gcc8 and gcc9 (jsc#SLE-7766 & jsc#SLE-8609).
-------------------------------------------------------------------
Thu Nov 28 15:54:19 UTC 2019 - Egbert Eich <eich@suse.com>
- Disable openmpi1 builds for SLE/Leap > 15.1.
- Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 24 06:37:26 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com> Thu Oct 24 06:37:26 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>

114
hdf5.spec
View File

@ -18,13 +18,10 @@
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%if 0%{?is_opensuse} || 0%{?is_backports} %if 0%{?sle_version} >= 150200
%undefine DisOMPI1
%undefine DisOMPI2
%undefine DisOMPI3
%else
%define DisOMPI1 ExclusiveArch: do_not_build %define DisOMPI1 ExclusiveArch: do_not_build
%undefine DisOMPI2 %endif
%if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200
%define DisOMPI3 ExclusiveArch: do_not_build %define DisOMPI3 ExclusiveArch: do_not_build
%endif %endif
@ -140,6 +137,15 @@ ExclusiveArch: do_not_build
%define mpi_vers 1 %define mpi_vers 1
%endif %endif
%if "%{flavor}" == "gnu7-openmpi2-hpc"
%{?DisOMPI2}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 7
%global mpi_flavor openmpi
%define mpi_vers 2
%endif
%if "%{flavor}" == "gnu7-mvapich2-hpc" %if "%{flavor}" == "gnu7-mvapich2-hpc"
%bcond_without hpc %bcond_without hpc
%define compiler_family gnu %define compiler_family gnu
@ -163,6 +169,102 @@ ExclusiveArch: do_not_build
%global mpi_flavor mpich %global mpi_flavor mpich
%endif %endif
%if "%{flavor}" == "gnu8-hpc"
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 8
%undefine mpi_flavor
%endif
%if "%{flavor}" == "gnu8-openmpi-hpc"
%{?DisOMPI1}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 8
%global mpi_flavor openmpi
%define mpi_vers 1
%endif
%if "%{flavor}" == "gnu8-openmpi2-hpc"
%{?DisOMPI2}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 8
%global mpi_flavor openmpi
%define mpi_vers 2
%endif
%if "%{flavor}" == "gnu8-openmpi3-hpc"
%{?DisOMPI3}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 8
%global mpi_flavor openmpi
%define mpi_vers 3
%endif
%if "%{flavor}" == "gnu8-mvapich2-hpc"
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 8
%global mpi_flavor mvapich2
%endif
%if "%{flavor}" == "gnu8-mpich-hpc"
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 8
%global mpi_flavor mpich
%endif
%if "%{flavor}" == "gnu9-hpc"
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 9
%undefine mpi_flavor
%endif
%if "%{flavor}" == "gnu9-openmpi-hpc"
%{?DisOMPI1}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 9
%global mpi_flavor openmpi
%define mpi_vers 1
%endif
%if "%{flavor}" == "gnu9-openmpi2-hpc"
%{?DisOMPI2}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 9
%global mpi_flavor openmpi
%define mpi_vers 2
%endif
%if "%{flavor}" == "gnu9-openmpi3-hpc"
%{?DisOMPI3}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 9
%global mpi_flavor openmpi
%define mpi_vers 3
%endif
%if "%{flavor}" == "gnu9-mvapich2-hpc"
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 9
%global mpi_flavor mvapich2
%endif
%if "%{flavor}" == "gnu9-mpich-hpc"
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 9
%global mpi_flavor mpich
%endif
# Don't build non-HPC on SLE # Don't build non-HPC on SLE
%if !0%{?is_opensuse} && !0%{?with_hpc:1} %if !0%{?is_opensuse} && !0%{?with_hpc:1}
ExclusiveArch: do_not_build ExclusiveArch: do_not_build