rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Upgrade to gcc-toolset-14 for rhel-9.6

Browse Source 
Related: RHEL-67369
This commit is contained in:
Eike Rathke 2024-12-03 15:01:20 +01:00
parent c73f5144a3
commit bdaeaed9fd
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firefox.spec
View File

@ -106,7 +106,13 @@ end}
%global nodejs_build_req nodejs
%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
%if 0%{?rhel} == 7
@ -435,10 +441,12 @@ BuildRequires: xorg-x11-server-Xvfb
%endif
%if 0%{?use_gcc_ts}
BuildRequires: gcc-toolset-13-runtime
BuildRequires: gcc-toolset-13-binutils
BuildRequires: gcc-toolset-13-gcc
BuildRequires: gcc-toolset-13-gcc-plugin-annobin
BuildRequires: gcc-toolset-%{gts_version}-runtime
BuildRequires: gcc-toolset-%{gts_version}-binutils
BuildRequires: gcc-toolset-%{gts_version}-gcc
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
Requires: mozilla-filesystem
@ -1414,7 +1422,7 @@ function install_rpms_to_current_dir() {
# Enable toolsets
set +e
%if 0%{?use_gcc_ts}
source scl_source enable gcc-toolset-13
source scl_source enable gcc-toolset-%{gts_version}
%endif
%if 0%{?use_dts}
source scl_source enable devtoolset-%{dts_version}