From 6ff8a3040a930fdca0a853e9302b35adf25cb81917fa0431d3eeee387e1feb64 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 15 Jan 2018 12:39:39 +0000 Subject: [PATCH] Accepting request 563893 from home:eeich:branches:fix-compilers-hpc - Disable the openmpi3 flavor in some products. OBS-URL: https://build.opensuse.org/request/show/563893 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=58 --- fftw3.changes | 5 +++++ fftw3.spec | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/fftw3.changes b/fftw3.changes index 913e59c..94f98fb 100644 --- a/fftw3.changes +++ b/fftw3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 12 15:33:40 UTC 2018 - eich@suse.com + +- Disable the openmpi3 flavor in some products. + ------------------------------------------------------------------- Fri Jan 5 18:32:30 UTC 2018 - eich@suse.com diff --git a/fftw3.spec b/fftw3.spec index 5f72615..ffff66a 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -27,6 +27,12 @@ %bcond_with ringdisabled +%if 0%{?is_opensuse} || 0%{?is_backports} +%undefine DisOMPI3 +%else +%define DisOMPI3 ExclusiveArch: do_not_build +%endif + %if "%flavor" == "" ExclusiveArch: do_not_build %define package_name %pname @@ -55,6 +61,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu-openmpi-hpc" +%{?DisOMPI1} %global compiler_family gnu %undefine c_f_ver %global mpi_flavor openmpi @@ -64,6 +71,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu-openmpi3-hpc" +%{?DisOMPI3} %global compiler_family gnu %undefine c_f_ver %global mpi_flavor openmpi @@ -96,6 +104,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu7-openmpi-hpc" +%{?DisOMPI1} %global compiler_family gnu %define c_f_ver 7 %global mpi_flavor openmpi @@ -105,6 +114,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu7-openmpi3-hpc" +%{?DisOMPI3} %global compiler_family gnu %define c_f_ver 7 %global mpi_flavor openmpi