Portable build

SOURCES/java-21-openjdk-portable.specfile

@@ -519,8 +519,6 @@
 %global __jar_repack 0
 # Define the architectures on which we build
 ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64
-# Define the OS this package is built on
-%global pkgos rhel7
 
 Name:    java-%{javaver}-%{origin}-portable%{?pkgos:-%{pkgos}}
 Version: %{newjavaver}.%{buildver}
@@ -683,8 +681,6 @@ BuildRequires: desktop-file-utils
 BuildRequires: elfutils-devel
 BuildRequires: file
 BuildRequires: fontconfig-devel
-BuildRequires: devtoolset-%{dtsversion}-gcc
-BuildRequires: devtoolset-%{dtsversion}-gcc-c++
 BuildRequires: gcc-c++
 BuildRequires: gdb
 BuildRequires: libxslt
@@ -1068,7 +1064,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 -c "bash ${top_dir_abs_src_path}/configure \
 %ifarch %{zero_arches}
     --with-jvm-variants=zero \
 %endif
@@ -1109,7 +1105,7 @@ function buildjdk() {
     --disable-warnings-as-errors"
 
     cat spec.gmk
-    scl enable devtoolset-%{dtsversion} "make LOG=trace $maketargets || \
+    bash -c "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
 }
@@ -1129,9 +1125,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}";
+                bash -c "objcopy --only-keep-debug ${file} ${noextfile}.debuginfo";
+                bash -c "objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file}";
+                bash -c "strip -g ${file}";
             fi
         done
 

SPECS/java-21-openjdk.spec

@@ -0,0 +1 @@
+../SOURCES/java-21-openjdk-portable.specfile