Dominique Leuenberger 2019-12-18 13:43:30 +00:00 committed by Git OBS Bridge
commit bfbf52dec3
3 changed files with 36 additions and 2 deletions

View File

@ -0,0 +1,26 @@
From b28db31429d9b3b6a57a182d79e63aafdd2843f1 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Fri, 6 Dec 2019 21:23:56 +0100
Subject: [PATCH] Support two-digit version numbers in gcc version check
fixes #2336 (non-recognition of gcc 10) with patch provided by JeffreyALaw.
---
f_check | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/f_check b/f_check
index 993ad9a3..79b24e2d 100644
--- a/f_check
+++ b/f_check
@@ -71,7 +71,7 @@ if ($compiler eq "") {
if ($data =~ /GNU/) {
- $data =~ /(\d)\.(\d).(\d)/;
+ $data =~ /(\d+)\.(\d+).(\d+)/;
$major = $1;
$minor = $2;
--
2.24.0

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Dec 8 09:03:24 UTC 2019 - Martin Liška <mliska@suse.cz>
- Add gcc10-Support-two-digit-version-numbers-in-gcc-version-che.patch
in order to fix boo#1158727.
-------------------------------------------------------------------
Mon Aug 12 06:22:47 UTC 2019 - Martin Liška <mliska@suse.cz>

View File

@ -1,7 +1,7 @@
#
# spec file for package openblas
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -121,7 +121,7 @@ Release: 0
Summary: An optimized BLAS library based on GotoBLAS2
License: BSD-3-Clause
Group: Productivity/Scientific/Math
Url: http://www.openblas.net
URL: http://www.openblas.net
Source0: https://github.com/xianyi/OpenBLAS/archive/v%{version}.tar.gz#/OpenBLAS-%{version}.tar.gz
Source1: README.SUSE
Source2: README.HPC.SUSE
@ -129,6 +129,7 @@ Source2: README.HPC.SUSE
Patch1: openblas-noexecstack.patch
# PATCH port
Patch3: openblas-s390.patch
Patch4: gcc10-Support-two-digit-version-numbers-in-gcc-version-che.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -234,6 +235,7 @@ This package contains headers for OpenBLAS.
%setup -q -n OpenBLAS-%{version}
%patch1 -p1
%patch3 -p1
%patch4 -p1
%ifarch s390
sed -i -e "s@m32@m31@" Makefile.system
%endif