Remove devtoolset

SOURCES/java-21-openjdk-portable.specfile

@@ -229,9 +229,6 @@
 # Target to use to just build HotSpot
 %global hotspot_target hotspot
 
-# DTS toolset to use to provide gcc & binutils
-%global dtsversion 10
-
 # Disable LTO as this causes build failures at the moment.
 # See RHBZ#1861401
 %define _lto_cflags %{nil}
@@ -682,8 +679,7 @@ BuildRequires: desktop-file-utils
 BuildRequires: elfutils-devel
 BuildRequires: file
 BuildRequires: fontconfig-devel
-BuildRequires: devtoolset-%{dtsversion}-gcc
-BuildRequires: devtoolset-%{dtsversion}-gcc-c++
+BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: gdb
 BuildRequires: libxslt
@@ -1065,7 +1061,7 @@ function buildjdk() {
     # rather than ${link_opt} as the system versions
     # are always used in a system_libs build, even
     # for the static library build
-    scl enable devtoolset-%{dtsversion} "bash ${top_dir_abs_src_path}/configure \
+    bash ${top_dir_abs_src_path}/configure \
 %ifarch %{zero_arches}
     --with-jvm-variants=zero \
 %endif
@@ -1106,8 +1102,8 @@ function buildjdk() {
     --disable-warnings-as-errors"
 
     cat spec.gmk
-    scl enable devtoolset-%{dtsversion} "make LOG=trace $maketargets || \
-        ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name \"hs_err_pid*.log\" | xargs cat && false )"
+    make LOG=trace $maketargets || \
+        ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name \"hs_err_pid*.log\" | xargs cat && false )
     popd
 }
 
@@ -1126,9 +1122,9 @@ function stripjdk() {
         for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
             if file ${file} | grep -q 'ELF'; then
                 noextfile=${file/.so/};
-                scl enable devtoolset-%{dtsversion} "objcopy --only-keep-debug ${file} ${noextfile}.debuginfo";
-                scl enable devtoolset-%{dtsversion} "objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file}";
-                scl enable devtoolset-%{dtsversion} "strip -g ${file}";
+                objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
+                objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
+                strip -g ${file};
             fi
         done