Revert "Restore native build for x86 as there is no portable build"

Retain portable_build-arches with x86-32 added for reference
Remove NEWS.

- Related: RHEL-12211

java-1.8.0-openjdk.spec

@@ -124,7 +124,7 @@
 # Set of architectures where we verify backtraces with gdb
 %global gdb_arches %{jit_arches} %{zero_arches}
 # Set of architectures for which we have a portable build
-%global portable_build_arches %{aarch64} %{power64} s390x x86_64
+%global portable_build_arches %{aarch64} %{ix86} %{power64} s390x x86_64
 
 # By default, we build a debug build during main build on JIT architectures
 %if %{with slowdebug}
@@ -339,7 +339,7 @@
 %global updatever       %(VERSION=%{whole_update}; echo ${VERSION##*u})
 # eg jdk8u60-b27 -> b27
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease      2
+%global rpmrelease      3
 # Settings used by the portable build
 %global portablerelease 2
 %global portablesuffix el8
@@ -369,10 +369,7 @@
 # parametrized macros are order-sensitive
 %global compatiblename  %{name}
 %global fullversion     %{compatiblename}-%{version}-%{release}
-# images stub
-%global jdkimage       j2sdk-image
 # output dir stub
-%define buildoutputdir() %{expand:build/jdk8.build%{?1}}
 %define installoutputdir() %{expand:install/jdk8.install%{?1}}
 # we can copy the javadoc to not arched dir, or make it not noarch
 %define uniquejavadocdir()    %{expand:%{fullversion}%{?1}}
@@ -1078,11 +1075,7 @@ exit 0
 
 %define files_demo() %{expand:
 %defattr(-,root,root,-)
-%ifarch %{portable_build_arches}
 %license %{installoutputdir -- %{?1}}/jre/LICENSE
-%else
-%license %{installoutputdir -- %{?1}}/images/%{jdkimage}/jre/LICENSE
-%endif
 }
 
 %define files_src() %{expand:
@@ -1094,21 +1087,13 @@ exit 0
 %define files_javadoc() %{expand:
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}
-%ifarch %{portable_build_arches}
 %license %{installoutputdir -- %{?1}}/jre/LICENSE
-%else
-%license %{installoutputdir -- %{?1}}/images/%{jdkimage}/jre/LICENSE
-%endif
 }
 
 %define files_javadoc_zip() %{expand:
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/%{uniquejavadocdir -- %{?1}}.zip
-%ifarch %{portable_build_arches}
 %license %{installoutputdir -- %{?1}}/jre/LICENSE
-%else
-%license %{installoutputdir -- %{?1}}/images/%{jdkimage}/jre/LICENSE
-%endif
 }
 
 %define files_accessibility() %{expand:
@@ -1314,9 +1299,6 @@ Source0: %{shenandoah_project}-%{shenandoah_repo}-%{shenandoah_revision}-4curve.
 # Custom README for -src subpackage
 Source2:  README.md
 
-# Release notes
-Source7: NEWS
-
 # Use 'icedtea_sync.sh' to update the following
 # They are based on code contained in the IcedTea project (3.x).
 # Systemtap tapsets. Zipped up to keep it small.
@@ -1552,7 +1534,6 @@ BuildRequires: zip
 BuildRequires: unzip
 # For definitions and macros like jvmdir
 BuildRequires: javapackages-filesystem
-%ifarch %{portable_build_arches}
 %if %{include_normal_build}
 BuildRequires: java-1.%{majorver}.0-openjdk-portable-unstripped = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix}
 %endif
@@ -1564,10 +1545,6 @@ BuildRequires: java-1.%{majorver}.0-openjdk-portable-devel-slowdebug = %{epoch}:
 %endif
 BuildRequires: java-1.%{majorver}.0-openjdk-portable-docs = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix}
 BuildRequires: java-1.%{majorver}.0-openjdk-portable-misc = %{epoch}:%{version}-%{portablerelease}.%{portablesuffix}
-%else
-# Require a boot JDK which doesn't fail due to RH1482244
-BuildRequires: java-%{buildjdkver}-openjdk-devel >= 1.7.0.151-2.6.11.3
-%endif
 # Zero-assembler build requirement
 %ifarch %{zero_arches}
 BuildRequires: libffi-devel
@@ -1595,10 +1572,6 @@ Provides: bundled(lcms2) = 2.10.0
 Provides: bundled(libjpeg) = 6b
 # Version in jdk/src/share/native/sun/awt/libpng/png.h
 Provides: bundled(libpng) = 1.6.37
-%ifnarch %{portable_build_arches}
-# We link statically against libstdc++ to increase portability
-BuildRequires: libstdc++-static
-%endif
 %endif
 
 # this is always built, also during debug-only build
@@ -2006,183 +1979,6 @@ sed -i -e "s:^security.systemCACerts=.*:security.systemCACerts=%{cacerts_file}:"
 
 %build
 
-%ifnarch %{portable_build_arches}
-
-# How many CPU's do we have?
-export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :)
-export NUM_PROC=${NUM_PROC:-1}
-%if 0%{?_smp_ncpus_max}
-# Honor %%_smp_ncpus_max
-[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
-%endif
-
-%ifarch s390x sparc64 alpha %{power64} %{aarch64}
-export ARCH_DATA_MODEL=64
-%endif
-%ifarch alpha
-export CFLAGS="$CFLAGS -mieee"
-%endif
-
-# We use ourcppflags because the OpenJDK build seems to
-# pass EXTRA_CFLAGS to the HotSpot C++ compiler...
-EXTRA_CFLAGS="%ourcppflags -Wno-error"
-EXTRA_CPP_FLAGS="%ourcppflags"
-
-%ifarch %{power64} ppc
-# fix rpmlint warnings
-EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-strict-aliasing"
-%endif
-EXTRA_ASFLAGS="${EXTRA_CFLAGS} -Wa,--generate-missing-build-notes=yes"
-export EXTRA_CFLAGS EXTRA_ASFLAGS
-
-(cd %{top_level_dir_name}/common/autoconf
- bash ./autogen.sh
-)
-
-function buildjdk() {
-    local outputdir=${1}
-    local buildjdk=${2}
-    local maketargets="${3}"
-    local debuglevel=${4}
-    local link_opt=${5}
-
-    local top_srcdir_abs_path=$(pwd)/%{top_level_dir_name}
-    # Variable used in hs_err hook on build failures
-    local top_builddir_abs_path=$(pwd)/${outputdir}
-
-    echo "Using output directory: ${outputdir}";
-
-    if [ "x${link_opt}" = "xbundled" ] ; then
-        libc_link_opt="static";
-    else
-        libc_link_opt="dynamic";
-     fi
-
-    echo "Checking build JDK ${buildjdk} is operational..."
-    ${buildjdk}/bin/java -version
-    echo "Using make targets: ${maketargets}"
-    echo "Using debuglevel: ${debuglevel}"
-    echo "Building 8u%{updatever}-%{buildver}, milestone %{milestone}"
-
-    mkdir -p ${outputdir}
-    pushd ${outputdir}
-
-    bash ${top_srcdir_abs_path}/configure \
-%ifarch %{jfr_arches}
-    --enable-jfr \
-%else
-    --disable-jfr \
-%endif
-%ifarch %{zero_arches}
-    --with-jvm-variants=zero \
-%endif
-    --with-native-debug-symbols=internal \
-    --with-milestone=%{milestone} \
-    --with-update-version=%{updatever} \
-    --with-build-number=%{buildver} \
-    --with-vendor-name="%{oj_vendor}" \
-    --with-vendor-url="%{oj_vendor_url}" \
-    --with-vendor-bug-url="%{oj_vendor_bug_url}" \
-    --with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \
-    --with-boot-jdk=${buildjdk} \
-    --with-debug-level=${debuglevel} \
-    --disable-sysconf-nss \
-    --enable-unlimited-crypto \
-    --with-zlib=${link_opt} \
-    --with-giflib=${link_opt} \
-%if %{with system_libs}
-    --with-libjpeg=${link_opt} \
-    --with-libpng=${link_opt} \
-    --with-lcms=${link_opt} \
-%endif
-    --with-stdc++lib=${libc_link_opt} \
-    --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
-    --with-extra-cflags="$EXTRA_CFLAGS" \
-    --with-extra-asflags="$EXTRA_ASFLAGS" \
-    --with-extra-ldflags="%{ourldflags}" \
-    --with-num-cores="$NUM_PROC"
-
-    cat spec.gmk
-    cat hotspot-spec.gmk
-
-    make \
-        JAVAC_FLAGS=-g \
-        LOG=trace \
-        SCTP_WERROR= \
-        ${maketargets} || ( pwd; find ${top_srcdir_abs_path} ${top_builddir_abs_path} -name "hs_err_pid*.log" | xargs cat && false )
-
-    popd
- }
-
-function installjdk() {
-    local outputdir=${1}
-    local installdir=${2}
-    local imagepath=${installdir}/images/%{jdkimage}
-
-    echo "Installing build from ${outputdir} to ${installdir}..."
-    mkdir -p ${installdir}
-    echo "Installing images..."
-    mv ${outputdir}/images ${installdir}
-    if [ -d ${outputdir}/bundles ] ; then
-        echo "Installing bundles...";
-        mv ${outputdir}/bundles ${installdir} ;
-    fi
-    if [ -d ${outputdir}/docs ] ; then
-        echo "Installing docs...";
-        mv ${outputdir}/docs ${installdir} ;
-    fi
-
-%if !%{with artifacts}
-    echo "Removing output directory...";
-    rm -rf ${outputdir}
-%endif
-
-    if [ -d ${imagepath} ] ; then
-        # the build (erroneously) removes read permissions from some jars
-        # this is a regression in OpenJDK 7 (our compiler):
-        # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
-        find ${imagepath} -iname '*.jar' -exec chmod ugo+r {} \;
-        chmod ugo+r ${imagepath}/lib/ct.sym
-
-        # remove redundant *diz and *debuginfo files
-        find ${imagepath} -iname '*.diz' -exec rm -v {} \;
-        find ${imagepath} -iname '*.debuginfo' -exec rm -v {} \;
-
-        # Build screws up permissions on binaries
-        # https://bugs.openjdk.java.net/browse/JDK-8173610
-        find ${imagepath} -iname '*.so' -exec chmod +x {} \;
-        find ${imagepath}/bin/ -exec chmod +x {} \;
-
-        # Install nss.cfg right away as we will be using the JRE above
-        install -m 644 nss.cfg ${imagepath}/jre/lib/security/
-
-        # Install nss.fips.cfg: NSS configuration for global FIPS mode (crypto-policies)
-        install -m 644 nss.fips.cfg ${imagepath}/jre/lib/security/
-
-        # add alt-java man page
-        pushd ${imagepath}
-        echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
-        cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
-        popd
-
-        # Print release information
-        cat ${imagepath}/release
-
-     fi
-}
-
-%if %{build_hotspot_first}
-  # Build a fresh libjvm.so first and use it to bootstrap
-  cp -LR --preserve=mode,timestamps %{bootjdk} newboot
-  systemjdk=$(pwd)/newboot
-  buildjdk build/newboot ${systemjdk} %{hotspot_target} "release" "bundled"
-  mv build/newboot/hotspot/dist/jre/lib/%{archinstall}/server/libjvm.so newboot/jre/lib/%{archinstall}/server
-%else
-  systemjdk=%{bootjdk}
-%endif
-
-%endif # portable_builds
-
 function customisejdk() {
     local imagepath=${1}
 
@@ -2204,8 +2000,6 @@ function customisejdk() {
 
 for suffix in %{build_loop} ; do
 
-%ifarch %{portable_build_arches}
-
     if [ "x$suffix" = "x" ] ; then
         jdkzip=%{releasezip}
     elif [ "x$suffix" = "x%{fastdebug_suffix_unquoted}" ] ; then
@@ -2216,7 +2010,6 @@ for suffix in %{build_loop} ; do
     fi
 
     installdir=%{installoutputdir -- ${suffix}}
-    imagedir=${installdir}
 
     # TODO: should verify checksums when using packages from buildroot
     tar -xJf ${jdkzip}
@@ -2230,57 +2023,15 @@ for suffix in %{build_loop} ; do
         fi
     done
 
-%else
-
-    if [ "x$suffix" = "x" ] ; then
-        debugbuild=release
-    else
-        # change --something to something
-        debugbuild=`echo $suffix  | sed "s/-//g"`
-    fi
-
-    builddir=%{buildoutputdir -- $suffix}
-    bootbuilddir=boot${builddir}
-    installdir=%{installoutputdir -- $suffix}
-    bootinstalldir=boot${installdir}
-    imagedir=${installdir}/images/%{jdkimage}
-    link_opt="%{link_type}"
-
-    # Debug builds don't need same targets as release for
-    # build speed-up. We also avoid bootstrapping these
-    # slower builds.
-    if echo $debugbuild | grep -q "debug" ; then
-        maketargets="%{debug_targets}"
-        run_bootstrap=false
-    else
-        maketargets="%{release_targets}"
-        run_bootstrap=%{bootstrap_build}
-    fi
-
-    if ${run_bootstrap} ; then
-        buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt}
-        installjdk ${bootbuilddir} ${bootinstalldir}
-        buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt}
-        installjdk ${builddir} ${installdir}
-        %{!?with_artifacts:rm -rf ${bootinstalldir}}
-    else
-        buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt}
-        installjdk ${builddir} ${installdir}
-    fi
-
-%endif # portable_builds
-
     # Final setup on the main image
-    customisejdk ${imagedir}
+    customisejdk ${installdir}
 
     # Print release information
-    cat ${imagedir}/release
+    cat ${installdir}/release
 
 # build cycles
 done
 
-%ifarch %{portable_build_arches}
-
 docdir=%{installoutputdir -- "-docs"}
 tar -xJf %{docszip}
 mv %{name}*.docs.* ${docdir}
@@ -2289,18 +2040,12 @@ miscdir=%{installoutputdir -- "-misc"}
 tar -xJf %{misczip}
 mv %{name}*.misc.* ${miscdir}
 
-%endif
-
 %check
 
 # We test debug first as it will give better diagnostics on a crash
 for suffix in %{build_loop} ; do
 
-%ifarch %{portable_build_arches}
 export JAVA_HOME=$(pwd)/%{installoutputdir -- $suffix}
-%else
-export JAVA_HOME=$(pwd)/%{installoutputdir -- $suffix}/images/%{jdkimage}
-%endif
 
 # Check unlimited policy has been used
 $JAVA_HOME/bin/javac -d . %{SOURCE13}
@@ -2425,24 +2170,14 @@ STRIP_KEEP_SYMTAB=libjvm*
 for suffix in %{build_loop} ; do
 
   # Should match same definitions in build section
-%ifarch %{portable_build_arches}
   jdk_image=%{installoutputdir -- $suffix}
   docdir=$(pwd)/%{installoutputdir -- "-docs"}
   miscdir=%{installoutputdir -- "-misc"}
-%else
-  jdk_image=%{installoutputdir -- $suffix}/images/%{jdkimage}
-  docdir=%{installoutputdir -- $suffix}
-  miscdir=%{top_level_dir_name}/jdk/src/solaris/classes/sun/awt/X11
-%endif
 
   # Install release notes
   commondocdir=${RPM_BUILD_ROOT}%{_defaultdocdir}/%{uniquejavadocdir -- $suffix}
   install -d -m 755 ${commondocdir}
-%ifarch %{portable_build_arches}
   mv ${jdk_image}/NEWS ${commondocdir}
-%else
-  cp -a %{SOURCE7} ${commondocdir}
-%endif
 
   # Install the jdk
   pushd ${jdk_image}
@@ -2507,11 +2242,7 @@ if ! echo $suffix | grep -q "debug" ; then
   install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
   cp -a ${docdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
   built_doc_archive=jdk-%{javaver}_%{updatever}%{milestone_version}$suffix-%{buildver}-docs.zip
-%ifarch %{portable_build_arches}
   cp -a ${docdir}/$built_doc_archive  $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
-%else
-  cp -a %{installoutputdir -- $suffix}/bundles/$built_doc_archive  $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
-%endif
 fi
 
 # Install icons and menu entries
@@ -2825,6 +2556,12 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Thu Apr 27 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.372.b07-3
+- Revert "Restore native build for x86 as there is no portable build"
+- Retain portable_build-arches with x86-32 added for reference
+- Remove NEWS.
+- Related: RHEL-12211
+
 * Tue Apr 18 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.372.b07-2
 - Update to shenandoah-jdk8u372-b07 (GA)
 - Update release notes for shenandoah-8u372-b07.