From 5cfe67610580c3b97fec33eb66df1c43f01daf15fd9ea91f56cef6ba9eb029f2 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 26 Feb 2020 14:57:18 +0000 Subject: [PATCH] Accepting request 779445 from home:eeich:branches:science - Add support for gcc8/9 building (jsc#SLE-8604). OBS-URL: https://build.opensuse.org/request/show/779445 OBS-URL: https://build.opensuse.org/package/show/science/metis?expand=0&rev=14 --- metis.changes | 5 +++++ metis.spec | 25 +++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/metis.changes b/metis.changes index f3be5c3..cf92726 100644 --- a/metis.changes +++ b/metis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 26 12:26:32 UTC 2020 - Egbert Eich + +- Add support for gcc8/9 building (jsc#SLE-8604). + ------------------------------------------------------------------- Fri Mar 15 07:23:19 UTC 2019 - Egbert Eich diff --git a/metis.spec b/metis.spec index 6a194bb..b639f26 100644 --- a/metis.spec +++ b/metis.spec @@ -1,7 +1,7 @@ # # spec file for package metis # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -48,6 +48,27 @@ ExclusiveArch: do_not_build %undefine mpi_flavor %endif +%if "%{flavor}" == "gnu7-hpc" +%bcond_without hpc +%define compiler_family gnu +%define c_f_ver 7 +%undefine mpi_flavor +%endif + +%if "%{flavor}" == "gnu8-hpc" +%bcond_without hpc +%define compiler_family gnu +%define c_f_ver 8 +%undefine mpi_flavor +%endif + +%if "%{flavor}" == "gnu9-hpc" +%bcond_without hpc +%define compiler_family gnu +%define c_f_ver 9 +%undefine mpi_flavor +%endif + %if %{without hpc} %if 0%{!?package_name:1} %define package_name %{pname} @@ -82,7 +103,7 @@ Release: 0 Summary: Serial Graph Partitioning and Fill-reducing Matrix Ordering License: Apache-2.0 Group: Productivity/Scientific/Math -Url: http://glaros.dtc.umn.edu/gkhome/metis/metis/overview +URL: http://glaros.dtc.umn.edu/gkhome/metis/metis/overview Source0: http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/%{pname}-%{version}.tar.gz # PATCH-FIX-OPENSUSE metis-cmake.patch Patch1: metis-cmake.patch