Accepting request 1042732 from home:eeich:branches:science:HPC

- Add support for gcc12 (jsc#PED-2834).

OBS-URL: https://build.opensuse.org/request/show/1042732
OBS-URL: https://build.opensuse.org/package/show/science:HPC/gnu-compilers-hpc?expand=0&rev=36
This commit is contained in:
Egbert Eich 2022-12-13 16:08:26 +00:00 committed by Git OBS Bridge
parent 7d9e7b3ec7
commit ed012818dd
3 changed files with 17 additions and 7 deletions

View File

@ -4,4 +4,5 @@
<package>gnu9-hpc</package>
<package>gnu10-hpc</package>
<package>gnu11-hpc</package>
<package>gnu12-hpc</package>
</multibuild>

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 13 15:31:07 UTC 2022 - Egbert Eich <eich@suse.com>
- Add support for gcc12 (jsc#PED-2834).
-------------------------------------------------------------------
Mon Dec 13 16:45:02 UTC 2021 - Antoine Ginies <aginies@suse.com>

View File

@ -1,5 +1,5 @@
#
# spec file for package gnu
# spec file
#
# Copyright (c) 2022 SUSE LLC
#
@ -49,12 +49,16 @@ ExclusiveArch: do_not_build
%if "%flavor" == "gnu10-hpc"
%define c_f_ver 10
%endif
%endif
%if "%flavor" == "gnu11-hpc"
%define c_f_ver 11
%endif
%if "%flavor" == "gnu12-hpc"
%define c_f_ver 12
%endif
# For Factory only build the default
%if 0%{?suse_version} > 1500 && "%flavor" != "gnu-hpc"
ExclusiveArch: do-not-build
@ -116,12 +120,12 @@ BuildArch: noarch
Provides: %{compiler_family}%{?hpc_prov_version}-compilers-hpc-devel = %version-%release
}
Requires: %{name} = %{version}
Requires: gcc%{hpc_cf_pack_version}
Requires: gcc%{hpc_cf_pack_version}-c++
Requires: gcc%{hpc_cf_pack_version}
Requires: gcc%{hpc_cf_pack_version}-c++
Requires: gcc%{hpc_cf_pack_version}-fortran
%if 0%{?hpc_rolling_release_version:1}
Requires: gcc%{hpc_rolling_release_version}
Requires: gcc%{hpc_rolling_release_version}-c++
Requires: gcc%{hpc_rolling_release_version}
Requires: gcc%{hpc_rolling_release_version}-c++
Requires: gcc%{hpc_rolling_release_version}-fortran
%endif
@ -151,7 +155,7 @@ echo "hpc_gnu_bin_version: %hpc_gnu_bin_version"
%{!?c_f_ver:echo "hpc_prov_version: %hpc_prov_version"}
%{__cat} <<EOF > %{meta}
%{name}-devel is a meta package to ensure installation of the
%{name}-devel is a meta package to ensure installation of the
gnu toolchain.
EOF