Upgrade to gcc-toolset-14 for rhel-9.6
Related: RHEL-67381
This commit is contained in:
parent
8b3cb01e06
commit
1232e0a1ec
@ -88,6 +88,12 @@ end}
|
|||||||
|
|
||||||
%if 0%{?rhel} > 7 && 0%{?rhel} < 10
|
%if 0%{?rhel} > 7 && 0%{?rhel} < 10
|
||||||
%global use_gcc_ts 1
|
%global use_gcc_ts 1
|
||||||
|
%if 0%{?rhel} == 9 && %{rhel_minor_version} >= 6
|
||||||
|
# clang depends on gcc-toolset-14-gcc-c++
|
||||||
|
%global gts_version 14
|
||||||
|
%else
|
||||||
|
%global gts_version 13
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?rhel} == 7
|
%if 0%{?rhel} == 7
|
||||||
@ -318,10 +324,12 @@ BuildRequires: zlib-devel
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?use_gcc_ts}
|
%if 0%{?use_gcc_ts}
|
||||||
BuildRequires: gcc-toolset-13-runtime
|
BuildRequires: gcc-toolset-%{gts_version}-runtime
|
||||||
BuildRequires: gcc-toolset-13-binutils
|
BuildRequires: gcc-toolset-%{gts_version}-binutils
|
||||||
BuildRequires: gcc-toolset-13-gcc
|
BuildRequires: gcc-toolset-%{gts_version}-gcc
|
||||||
BuildRequires: gcc-toolset-13-gcc-plugin-annobin
|
BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin
|
||||||
|
# Do not explicitly require gcc-toolset-%{gts_version}-gcc-g++ instead fail
|
||||||
|
# when clang is upgraded to depend on a later toolset and adjust version.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{?use_openssl_for_librnp}
|
%if %{?use_openssl_for_librnp}
|
||||||
@ -1251,7 +1259,7 @@ function install_rpms_to_current_dir() {
|
|||||||
# Enable toolsets
|
# Enable toolsets
|
||||||
set +e
|
set +e
|
||||||
%if 0%{?use_gcc_ts}
|
%if 0%{?use_gcc_ts}
|
||||||
source scl_source enable gcc-toolset-13
|
source scl_source enable gcc-toolset-%{gts_version}
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?use_dts}
|
%if 0%{?use_dts}
|
||||||
source scl_source enable devtoolset-%{dts_version}
|
source scl_source enable devtoolset-%{dts_version}
|
||||||
|
Loading…
Reference in New Issue
Block a user