From 6eaaf554602e6ffc89c50709202ffd8a46eb390fa905734d92b74f24a2291605 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 11 Sep 2020 08:24:36 +0000 Subject: [PATCH] Accepting request 833594 from home:eeich:branches:science - Add build support for gcc10 to HPC build (bsc#1174439). OBS-URL: https://build.opensuse.org/request/show/833594 OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=137 --- hdf5.changes | 5 +++++ hdf5.spec | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/hdf5.changes b/hdf5.changes index f9cfe7c..9f7b4d7 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 23 16:33:58 UTC 2020 - Egbert Eich + +- Add build support for gcc10 to HPC build (bsc#1174439). + ------------------------------------------------------------------- Mon Jul 20 14:48:42 UTC 2020 - Egbert Eich diff --git a/hdf5.spec b/hdf5.spec index ea1b977..1aa4af3 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -310,6 +310,63 @@ ExclusiveArch: do_not_build %global mpi_flavor mpich %endif +%if "%{flavor}" == "gnu10-hpc" +%bcond_without hpc +%define compiler_family gnu +%define c_f_ver 10 +%undefine mpi_flavor +%endif + +%if "%{flavor}" == "gnu10-openmpi-hpc" +%{?DisOMPI1} +%bcond_without hpc +%define compiler_family gnu +%define c_f_ver 10 +%global mpi_flavor openmpi +%define mpi_vers 1 +%endif + +%if "%{flavor}" == "gnu10-openmpi2-hpc" +%{?DisOMPI2} +%bcond_without hpc +%define compiler_family gnu +%define c_f_ver 10 +%global mpi_flavor openmpi +%define mpi_vers 2 +%endif + +%if "%{flavor}" == "gnu10-openmpi3-hpc" +%{?DisOMPI3} +%bcond_without hpc +%define compiler_family gnu +%define c_f_ver 10 +%global mpi_flavor openmpi +%define mpi_vers 3 +%endif + +%if "%{flavor}" == "gnu10-openmpi4-hpc" +%{?DisOMPI4} +%bcond_without hpc +%define compiler_family gnu +%define c_f_ver 10 +%global mpi_flavor openmpi +%define mpi_vers 4 +%endif + +%if "%{flavor}" == "gnu10-mvapich2-hpc" +%bcond_without hpc +%define compiler_family gnu +%define c_f_ver 10 +%global mpi_flavor mvapich2 +%endif + +%if "%{flavor}" == "gnu10-mpich-hpc" +%bcond_without hpc +%define compiler_family gnu +%define c_f_ver 10 +%global mpi_flavor mpich +%endif + %{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}} %{?with_hpc:%{!?compiler_family:%global compiler_family gnu}} %{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}}