Hello community,
here is the log from the commit of package gnu-compilers-hpc for
openSUSE:Factory checked in at 2020-07-29 17:16:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnu-compilers-hpc (Old)
and /work/SRC/openSUSE:Factory/.gnu-compilers-hpc.new.3592 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnu-compilers-hpc"
Wed Jul 29 17:16:36 2020 rev:10 rq:822744 version:1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnu-compilers-hpc/gnu-compilers-hpc.changes
2019-10-21 12:29:25.360030207 +0200
+++
/work/SRC/openSUSE:Factory/.gnu-compilers-hpc.new.3592/gnu-compilers-hpc.changes
2020-07-29 17:17:12.568399989 +0200
@@ -1,0 +2,6 @@
+Thu Jul 23 16:13:13 UTC 2020 - Egbert Eich <e...@suse.com>
+
+- Add build support for gcc10 to HPC build (bsc#1174439).
+ Fix version parsing for gcc10 and up.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnu-compilers-hpc.spec ++++++
--- /var/tmp/diff_new_pack.eZZfQ3/_old 2020-07-29 17:17:15.064402028 +0200
+++ /var/tmp/diff_new_pack.eZZfQ3/_new 2020-07-29 17:17:15.064402028 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gnu
#
-# 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
@@ -47,9 +47,15 @@
%define c_f_ver 9
%endif
+%if "%flavor" == "gnu10-hpc"
+%define c_f_ver 10
+%endif
+
# Keep in sync with macros.hpc-gnu
-%global hpc_gnu_bin_version %{?c_f_ver:-%(echo %c_f_ver | \
- sed -e "s@\\([0-9]\\)@\\1.@g" -e "s@\\([0-9]\\)\\.\\$@\\1@g")}
+# ab >= 40 - version: a.b to accompodate for old gcc version scheme of gcc < 5
+%global hpc_gnu_bin_version %{?c_f_ver:-%(v=%c_f_ver; [ $v -lt 40 ] && echo $v
||
+ sed -e "s@\\([0-9]\\)@\\1.@g" \\
+ -e "s@\\([0-9]\\)\\.\\$@\\1@g" <<< $v)}
%global hpc_gnu_full_version %( gcc%{hpc_gnu_bin_version} --version |\
head -1 |\
sed -e "s#.* \\([0-9]\\+\\.[0-9.]\\+\\)\\(\$\\| .*\\)#\\1#" )
@@ -72,7 +78,7 @@
Version: 1.4
Release: 0
-Url: https://github.com/openhpc/ohpc
+URL: https://github.com/openhpc/ohpc
Source0:
https://raw.githubusercontent.com/openSUSE/hpc/master/compiler/macros.hpc-gnu
Source1: LICENSE
Source2: gnu-compilers-hpc-rpmlintrc
++++++ macros.hpc-gnu ++++++
--- /var/tmp/diff_new_pack.eZZfQ3/_old 2020-07-29 17:17:15.144402093 +0200
+++ /var/tmp/diff_new_pack.eZZfQ3/_new 2020-07-29 17:17:15.148402096 +0200
@@ -9,9 +9,9 @@
%{-v: %define _cf_ver %{-v*}} \
%{echo: hpc_gnu_init %{?_cf_ver:version: %_cf_ver}} \
%{expand: %%global hpc_gnu_bin_version %{?_cf_ver:-%(\\\
- echo %_cf_ver | \\\
+ v=%_cf_ver; [ $v -lt 40 ] && echo $v || \\\
sed -e "s@\\([0-9]\\)@\\1.@g" \\\
- -e "s@\\([0-9]\\)\\.\\$@\\1@g")}%{!?_cf_ver:%%{nil}}} \
+ -e "s@\\([0-9]\\)\\.\\$@\\1@g" <<< $v)}%{!?_cf_ver:%%{nil}}} \
%{expand: %%global hpc_gnu_full_version %(\\\
gcc%{hpc_gnu_bin_version} --version |\\\
head -1 |\\\
