From dea5e8545db041f55563123fc977567196ea1440 Mon Sep 17 00:00:00 2001
From: ebasov <eduard.basov@softline.com>
Date: Fri, 24 Jan 2025 15:02:07 +0300
Subject: [PATCH] Delete path gcc compiler and add macros gcc-toolset-12

---
 SPECS/kernel-6.1.spec | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/SPECS/kernel-6.1.spec b/SPECS/kernel-6.1.spec
index d0744de..620dea7 100644
--- a/SPECS/kernel-6.1.spec
+++ b/SPECS/kernel-6.1.spec
@@ -223,6 +223,13 @@ BuildRequires: nss-tools, pesign >= 0.10-4, system-sb-certs
 %endif
 %endif
 
+BuildRequires: gcc-toolset-12
+
+%enable_devtoolset12
+
+BuildRequires: gcc-toolset-12-annobin-symlink
+
+
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 ###
@@ -684,7 +691,7 @@ InitBuildVars() {
     # if we are post rc1 this should match anyway so this won't matter
     perl -p -i -e 's/^PATCHLEVEL.*/PATCHLEVEL = %{patchlevel}/' Makefile
         
-    %{make} %{?_smp_mflags} CC=/opt/rh/gcc-toolset-13/root/bin/gcc mrproper
+    %{make} %{?_smp_mflags} mrproper
     cp configs/$Config .config
 
     Arch=`head -1 .config | cut -b 3-`
@@ -743,12 +750,12 @@ BuildKernel() {
     perl -p -i -e "s/^CONFIG_BUILD_SALT.*/CONFIG_BUILD_SALT=\"%{KVERREL}\"/" .config
 
     %if %{with_std}
-    %{make} %{?_smp_mflags} ARCH=%{bldarch} CC=/opt/rh/gcc-toolset-13/root/bin/gcc %{make_target}
+    %{make} %{?_smp_mflags} ARCH=%{bldarch} %{make_target}
 
-    %{make} %{?_smp_mflags} ARCH=%{bldarch} CC=/opt/rh/gcc-toolset-13/root/bin/gcc modules || exit 1
+    %{make} %{?_smp_mflags} ARCH=%{bldarch} modules || exit 1
 
     %ifarch aarch64
-    %{make} %{?_smp_mflags} ARCH=%{bldarch} CC=/opt/rh/gcc-toolset-13/root/bin/gcc dtbs
+    %{make} %{?_smp_mflags} ARCH=%{bldarch} dtbs
     %endif
 
     %if %{with_bpftool}
@@ -820,13 +827,13 @@ BuildKernel() {
 
     # Override mod-fw because we don't want it to install any firmware.
     # We'll get it from the linux-firmware package and we don't want conflicts.
-    %{make} %{?_smp_mflags} ARCH=%{bldarch} CC=/opt/rh/gcc-toolset-13/root/bin/gcc INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
+    %{make} %{?_smp_mflags} ARCH=%{bldarch} INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
     
     # Add a noop %%defattr statement because rpm doesn't like empty file list files.
     echo '%%defattr(-,-,-)' > ../%{name}${Variant:+-${Variant}}-ldsoconf.list
 
     %if %{with_vdso_install}
-    %{make} %{?_smp_mflags} ARCH=%{bldarch} CC=/opt/rh/gcc-toolset-13/root/bin/gcc INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer
+    %{make} %{?_smp_mflags} ARCH=%{bldarch} INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer
 
     if [ $DoVDSO -ne 0 ]; then
        if [ -s ldconfig-kernel.conf ]; then