Explicitly exclude x86, as on RHEL RPMs

Remove remaining traces of devtoolset

java-17-openjdk.spec

@@ -505,6 +505,9 @@
 %global tapsetdir %{tapsetdirttapset}/%{stapinstall}
 %endif
 
+# x86 is not supported by OpenJDK 17
+ExcludeArch: %{ix86}
+
 # Portables have no repo (requires/provides), but these are awesome for orientation in spec
 # Also scriptlets are happily missing and files are handled old fashion
 # not-duplicated requires/provides/obsoletes for normal/debug packages
@@ -717,7 +720,7 @@ BuildRequires: tar
 BuildRequires: unzip
 # No javapackages-filesystem on el7,nor is needed for portables
 # BuildRequires: javapackages-filesystem
-BuildRequires: java-%%{buildjdkver}-openjdk-devel
+BuildRequires: java-%{buildjdkver}-openjdk-devel
 # Zero-assembler build requirement
 %ifarch %{zero_arches}
 BuildRequires: libffi-devel
@@ -1120,12 +1123,13 @@ function buildjdk() {
 %ifarch %{zgc_arches}
     --with-jvm-features=zgc \
 %endif
-    --disable-warnings-as-errors"
+    --disable-warnings-as-errors
 
-cat spec.gmk
-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
+    cat spec.gmk
+    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
 }
 
 function installjdk() {
@@ -1251,9 +1255,9 @@ function packagejdk() {
         for file in $(find ${jdkname} ${jrename} -type f) ; do
             if file ${file} | grep -q 'ELF'; then
                 noextfile=${file/.so/};
-                scl enable devtoolset-8 "objcopy --only-keep-debug ${file} ${noextfile}.debuginfo";
-                scl enable devtoolset-8 "objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file}";
-                scl enable devtoolset-8 "strip -g ${file}";
+                objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
+                objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
+                strip -g ${file};
             fi
         done
 
@@ -1661,6 +1665,7 @@ done
 - Sync with existing RHEL 8 build, in order to start building portables on RHEL 8
 - Restore system bootstrap JDK (RHEL 8 has java-17-openjdk)
 - Remove use of devtoolset (RHEL 8 native compilers should be sufficient)
+- Explicitly exclude x86, as on RHEL RPMs
 
 * Tue Feb 21 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.6.0.10-6
 - Add docs, icons and samples to the portable output