From 1f35ef662468626f87208f7a8fe472e6cf7870212c369b771bcb8de48df17983 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Tue, 9 Feb 2021 09:54:31 +0000 Subject: [PATCH] Accepting request 869920 from home:eeich:branches:science - Add support for gcc8 and gcc9 builds for HPC (jsc#SLE-7766, jsc#SLE-8604). - Add build support for gcc10 to HPC build (bsc#1174439). OBS-URL: https://build.opensuse.org/request/show/869920 OBS-URL: https://build.opensuse.org/package/show/science/gsl?expand=0&rev=35 --- gsl.changes | 7 +++++++ gsl.spec | 30 +++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/gsl.changes b/gsl.changes index 14d791d..b21b3d9 100644 --- a/gsl.changes +++ b/gsl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 6 08:08:30 UTC 2021 - Egbert Eich + +- Add support for gcc8 and gcc9 builds for HPC (jsc#SLE-7766, + jsc#SLE-8604). +- Add build support for gcc10 to HPC build (bsc#1174439). + ------------------------------------------------------------------- Fri Nov 15 09:59:28 UTC 2019 - Christian Goll diff --git a/gsl.spec b/gsl.spec index 702fb48..293263d 100644 --- a/gsl.spec +++ b/gsl.spec @@ -1,7 +1,7 @@ # # spec file for package gsl # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -49,6 +49,34 @@ ExclusiveArch: do_not_build %bcond_without hpc %endif +%if "%{flavor}" == "gnu7-hpc" +%define compiler_family gnu +%define c_f_ver 7 +%define manext %{nil} +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu8-hpc" +%define compiler_family gnu +%define c_f_ver 8 +%define manext %{nil} +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu9-hpc" +%define compiler_family gnu +%define c_f_ver 9 +%define manext %{nil} +%bcond_without hpc +%endif + +%if "%{flavor}" == "gnu10-hpc" +%define compiler_family gnu +%define c_f_ver 10 +%define manext %{nil} +%bcond_without hpc +%endif + %if %{without hpc} %if 0%{!?package_name:1} %define package_name %{pname}