From dc6b65f6717403f4fc3004e338c6c073cbc09e90 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Tue, 3 Dec 2024 15:01:20 +0100
Subject: [PATCH] Upgrade to gcc-toolset-14 for rhel-9.6

Related: RHEL-73897
---
 firefox.spec | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index 41c8e82..f4e68ff 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -117,7 +117,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
@@ -469,10 +475,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
@@ -1465,7 +1473,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}