From 0dd645b217d0f9cfdf316265d539900e5f32dadb1ac4a363a4fe59f5630bb9d7 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Tue, 2 Jun 2020 08:26:59 +0000 Subject: [PATCH] Accepting request 810731 from home:eeich:branches:science - Add macros to handle building of openmpi1 flavors for serial builds as well (bsc#1172345). OBS-URL: https://build.opensuse.org/request/show/810731 OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=46 --- mumps.changes | 6 ++++++ mumps.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mumps.changes b/mumps.changes index 52fbd1c..8a4b680 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 2 07:50:37 UTC 2020 - Egbert Eich + +- Add macros to handle building of openmpi1 flavors for serial + builds as well (bsc#1172345). + ------------------------------------------------------------------- Tue Dec 3 12:06:39 UTC 2019 - Egbert Eich diff --git a/mumps.spec b/mumps.spec index 8029f13..d7fb99a 100644 --- a/mumps.spec +++ b/mumps.spec @@ -1,7 +1,7 @@ # # spec file for package mumps # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -53,6 +53,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "openmpi1" +%{?DisOMPI1} %define mpi_family openmpi %define mumps_f77_mpilibs -lmpi_mpifh -lmpi %define mpi_ver 1 @@ -80,6 +81,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "scotch-openmpi1" +%{?DisOMPI1} %define mpi_family openmpi %define mumps_f77_mpilibs -lmpi_mpifh -lmpi %define mpi_ver 1