From fd78914cdc9e8cf693005cfd7956c702afe24730f6b5d8ff56de356d45f0de66 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 12 Jan 2018 17:07:57 +0000 Subject: [PATCH] Accepting request 563895 from home:eeich:branches:fix-compilers-hpc - Disable the openmpi3 flavor in some products. OBS-URL: https://build.opensuse.org/request/show/563895 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mpiP?expand=0&rev=15 --- mpiP.changes | 5 +++++ mpiP.spec | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/mpiP.changes b/mpiP.changes index a6c8f52..41ef131 100644 --- a/mpiP.changes +++ b/mpiP.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 12 15:37:28 UTC 2018 - eich@suse.com + +- Disable the openmpi3 flavor in some products. + ------------------------------------------------------------------- Fri Jan 5 19:00:01 UTC 2018 - eich@suse.com diff --git a/mpiP.spec b/mpiP.spec index 3e19e5a..1138389 100644 --- a/mpiP.spec +++ b/mpiP.spec @@ -22,11 +22,18 @@ %define vers 3.4.1 %define _vers 3_4_1 +%if 0%{?is_opensuse} || 0%{?is_backports} +%undefine DisOMPI3 +%else +%define DisOMPI3 ExclusiveArch: do_not_build +%endif + %if "%flavor" == "" ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu-openmpi-hpc" +%{?DisOMPI1} %global compiler_family gnu %undefine c_f_ver %define mpi_family openmpi @@ -34,6 +41,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu-openmpi3-hpc" +%{?DisOMPI3} %global compiler_family gnu %undefine c_f_ver %define mpi_family openmpi @@ -53,6 +61,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu7-openmpi-hpc" +%{?DisOMPI1} %global compiler_family gnu %define c_f_ver 7 %define mpi_family openmpi @@ -60,6 +69,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu7-openmpi3-hpc" +%{?DisOMPI3} %global compiler_family gnu %define c_f_ver 7 %define mpi_family openmpi