Accepting request 822743 from home:eeich:branches:science:HPC
Fix version parsing for gcc10 and up. OBS-URL: https://build.opensuse.org/request/show/822743 OBS-URL: https://build.opensuse.org/package/show/science:HPC/gnu-compilers-hpc?expand=0&rev=27
This commit is contained in:
parent
797db9a0a1
commit
ecdbf34875
@ -2,6 +2,7 @@
|
|||||||
Thu Jul 23 16:13:13 UTC 2020 - Egbert Eich <eich@suse.com>
|
Thu Jul 23 16:13:13 UTC 2020 - Egbert Eich <eich@suse.com>
|
||||||
|
|
||||||
- Add build support for gcc10 to HPC build (bsc#1174439).
|
- 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>
|
||||||
|
@ -52,8 +52,10 @@ ExclusiveArch: do_not_build
|
|||||||
%endif
|
%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#" )
|
||||||
|
@ -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 |\\\
|
||||||
|
Loading…
Reference in New Issue
Block a user