pool/gnu-compilers-hpc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 822744 from science:HPC

Browse Source 
Fix version parsing for gcc10 and up. (forwarded request 822743 from eeich)

OBS-URL: https://build.opensuse.org/request/show/822744
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnu-compilers-hpc?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2020-07-29 15:16:36 +00:00 committed by Git OBS Bridge
commit 3e640b52c8
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu-compilers-hpc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 23 16:13:13 UTC 2020 - Egbert Eich <eich@suse.com>
- Add build support for gcc10 to HPC build (bsc#1174439).
Fix version parsing for gcc10 and up.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 2 05:30:55 UTC 2019 - Egbert Eich <eich@suse.com> Fri Aug 2 05:30:55 UTC 2019 - Egbert Eich <eich@suse.com>

14
gnu-compilers-hpc.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package gnu # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -47,9 +47,15 @@ ExclusiveArch: do_not_build
%define c_f_ver 9 %define c_f_ver 9
%endif %endif
%if "%flavor" == "gnu10-hpc"
%define c_f_ver 10
%endif
# Keep in sync with macros.hpc-gnu # Keep in sync with macros.hpc-gnu
%global hpc_gnu_bin_version %{?c_f_ver:-%(echo %c_f_ver | \ # ab >= 40 - version: a.b to accompodate for old gcc version scheme of gcc < 5
sed -e "s@\\([0-9]\\)@\\1.@g" -e "s@\\([0-9]\\)\\.\\$@\\1@g")} %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 |\ %global hpc_gnu_full_version %( gcc%{hpc_gnu_bin_version} --version |\
head -1 |\ head -1 |\
sed -e "s#.* \\([0-9]\\+\\.[0-9.]\\+\\)\\(\$\\| .*\\)#\\1#" ) sed -e "s#.* \\([0-9]\\+\\.[0-9.]\\+\\)\\(\$\\| .*\\)#\\1#" )
@ -72,7 +78,7 @@ Name: %myname
Version: 1.4 Version: 1.4
Release: 0 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 Source0: https://raw.githubusercontent.com/openSUSE/hpc/master/compiler/macros.hpc-gnu
Source1: LICENSE Source1: LICENSE
Source2: gnu-compilers-hpc-rpmlintrc Source2: gnu-compilers-hpc-rpmlintrc

4
macros.hpc-gnu
View File

@ -9,9 +9,9 @@
%{-v: %define _cf_ver %{-v*}} \ %{-v: %define _cf_ver %{-v*}} \
%{echo: hpc_gnu_init %{?_cf_ver:version: %_cf_ver}} \ %{echo: hpc_gnu_init %{?_cf_ver:version: %_cf_ver}} \
%{expand: %%global hpc_gnu_bin_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" \\\ 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 %(\\\ %{expand: %%global hpc_gnu_full_version %(\\\
gcc%{hpc_gnu_bin_version} --version |\\\ gcc%{hpc_gnu_bin_version} --version |\\\
head -1 |\\\ head -1 |\\\