From b494211ca757133d395fea0b054fbcae9d73480c3d34d6d3c6b4d5d91f5ac0e3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 8 Feb 2021 11:25:01 +0000 Subject: [PATCH] Accepting request 869931 from home:eeich:branches:multimedia:libs - Add build support for gcc10 to HPC build (bsc#1174439). OBS-URL: https://build.opensuse.org/request/show/869931 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=89 --- fftw3.changes | 5 +++++ fftw3.spec | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/fftw3.changes b/fftw3.changes index db02a3d..8e8a246 100644 --- a/fftw3.changes +++ b/fftw3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 6 10:13:41 UTC 2021 - Egbert Eich + +- Add build support for gcc10 to HPC build (bsc#1174439). + ------------------------------------------------------------------- Sun Jan 24 19:36:58 UTC 2021 - Dirk Müller diff --git a/fftw3.spec b/fftw3.spec index c7224d7..74fe45d 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -282,6 +282,59 @@ ExclusiveArch: do_not_build %bcond_without mpi %endif +%if "%flavor" == "gnu10-hpc" +%define compiler_family gnu +%define c_f_ver 10 +%bcond_with mpi +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu10-openmpi-hpc" +%{?DisOMPI1} +%global compiler_family gnu +%define c_f_ver 10 +%global mpi_flavor openmpi +%define mpi_vers 1 +%bcond_without hpc +%bcond_without mpi +%endif + +%if "%{flavor}" == "gnu10-openmpi3-hpc" +%{?DisOMPI3} +%global compiler_family gnu +%define c_f_ver 10 +%global mpi_flavor openmpi +%define mpi_vers 3 +%bcond_without hpc +%bcond_without mpi +%endif + +%if "%{flavor}" == "gnu10-openmpi4-hpc" +%{?DisOMPI4} +%global compiler_family gnu +%define c_f_ver 10 +%global mpi_flavor openmpi +%define mpi_vers 4 +%bcond_without hpc +%bcond_without mpi +%endif + +%if "%{flavor}" == "gnu10-mvapich2-hpc" +%global compiler_family gnu +%define c_f_ver 10 +%define mpi_flavor mvapich2 +%bcond_without hpc +%bcond_without mpi +%endif + +%if "%{flavor}" == "gnu10-mpich-hpc" +%global compiler_family gnu +%define c_f_ver 10 +%define mpi_flavor mpich +%bcond_without hpc +%bcond_without mpi +%endif + # now exchange the paths %if %{with hpc} %{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}}