/[packages]/updates/8/java-1.8.0-openjdk/current/SPECS/java-1.8.0-openjdk.spec

Diff of /updates/8/java-1.8.0-openjdk/current/SPECS/java-1.8.0-openjdk.spec

Parent Directory | Revision Log | View Patch Patch

-revision 1860410 by neoclust,
Thu May 26 16:48:59 2022 UTC
+revision 1860587 by neoclust,
Sat May 28 15:51:06 2022 UTC
 Line 28
  # Remove build artifacts by default
  %bcond_with artifacts
+ # Build a fresh libjvm.so for use in a copy of the bootstrap JDK
+ %bcond_without fresh_libjvm
+ # Define whether to use the bootstrap JDK directly or with a fresh libjvm.so
+ %if %{with fresh_libjvm}
+ %global build_hotspot_first 1
+ %else
+ %global build_hotspot_first 0
+ %endif
  # The -g flag says to use strip -g instead of full strip on DSOs or EXEs.
  # This fixes detailed NMT and other tools which need minimal debug info.
  # See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879
-Line 94
+Line 103
  # Set of architectures for which we build fastdebug builds
  %global fastdebug_arches x86_64 ppc64le aarch64
  # Set of architectures with a Just-In-Time (JIT) compiler
- %global jit_arches      %{debug_arches}
+ %global jit_arches      %{aarch64} %{power64} sparcv9 sparc64 x86_64
  # Set of architectures which use the Zero assembler port (!jit_arches)
- %global zero_arches %{arm} ppc s390 s390x
+ %global zero_arches %{arm} %{ix86} ppc s390 s390x
  # Set of architectures which run a full bootstrap cycle
  %global bootstrap_arches %{jit_arches} %{zero_arches}
  # Set of architectures which support SystemTap tapsets
-Line 107
+Line 116
  # See https://bugzilla.redhat.com/show_bug.cgi?id=513605
  # MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT
  %global share_arches    %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
+ # Set of architectures which support JFR
  %global jfr_arches      %{jit_arches}
+ # Set of architectures where we verify backtraces with gdb (ideally all)
+ # Temporarily disable check on x86, x86_64, ppc64le and s390x as gdb crashes
+ # ../../gdb/objfiles.h:510: internal-error: sect_index_data not initialized
+ # A problem internal to GDB has been detected,
+ # further debugging may prove unreliable.
+ # See https://bugzilla.redhat.com/show_bug.cgi?id=2041970
+ %global gdb_arches sparcv9 sparc64 %{aarch64} %{arm} ppc s390
  # Set of architectures for which alt-java has SSB mitigation
  %global ssbd_arches x86_64
-Line 146
+Line 163
  %global fastdebug_build %{nil}
  %endif
- # If you disable both builds, then the build fails
+ # If you disable all builds, then the build fails
  # Build and test slowdebug first as it provides the best diagnostics
  %global build_loop  %{slowdebug_build} %{fastdebug_build} %{normal_build}
-Line 159
+Line 176
  %global bootstrap_targets images
  %global release_targets images docs-zip
  %global debug_targets images
+ # Target to use to just build HotSpot
+ %global hotspot_target hotspot
+ # JDK to use for bootstrapping
+ # Use OpenJDK 7 where available (on RHEL) to avoid
+ # having to use the rhel-7.x-java-unsafe-candidate hack
+ # Change this for bootstrapping
+ ##global buildjdkver 1.7.0
+ %global buildjdkver 1.8.0
+ %global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk
  # Disable LTO as this causes build failures at the moment.
  # See RHBZ#1861401
-Line 297
+Line 324
  %global updatever       %(VERSION=%{whole_update}; echo ${VERSION##*u})
  # eg jdk8u60-b27 -> b27
  %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
- %global rpmrelease      1
+ %global rpmrelease      2
  # Define milestone (EA for pre-releases, GA ("fcs") for releases)
  # Release will be (where N is usually a number starting at 1):
  # - 0.N%%{?extraver}%%{?dist} for EA releases,
-Line 790 
 exit 0
+Line 817 
 exit 0
  %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libnio.so
  %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libnpt.so
  %ifarch %{sa_arches}
+ %ifnarch %{zero_arches}
  %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libsaproc.so
  %endif
+ %endif
  %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libsctp.so
  %{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libsunec.so
  #%{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libsystemconf.so
-Line 928 
 exit 0
+Line 957 
 exit 0
  %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jconsole.jar
  %{_jvmdir}/%{sdkdir -- %{?1}}/lib/orb.idl
  %ifarch %{sa_arches}
+ %ifnarch %{zero_arches}
  %{_jvmdir}/%{sdkdir -- %{?1}}/lib/sa-jdi.jar
  %endif
+ %endif
  %{_jvmdir}/%{sdkdir -- %{?1}}/lib/dt.jar
  %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
  %{_jvmdir}/%{sdkdir -- %{?1}}/lib/tools.jar
-Line 1309 
 Patch600: rh1750419-redhat_alt_java.patc
+Line 1340 
 Patch600: rh1750419-redhat_alt_java.patc
  # JDK-8218811: replace open by os::open in hotspot coding
  # This fixes a GCC 10 build issue
  Patch111: jdk8218811-perfMemory_linux.patch
- # Similar for GCC 11
+ # JDK-8281098, PR3836: Extra compiler flags not passed to adlc build
- Patch112: %{name}-gcc11.patch
+ Patch112: jdk8281098-pr3836-pass_compiler_flags_to_adlc.patch
  #############################################
  #
-Line 1355 
 Patch203: jdk8042159-allow_using_system_
+Line 1386 
 Patch203: jdk8042159-allow_using_system_
  Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch
  # JDK-8195607, PR3776, RH1760437: sun/security/pkcs11/Secmod/TestNssDbSqlite.java failed with "NSS initialization failed" on NSS 3.34.1
  Patch580: jdk8195607-pr3776-rh1760437-nss_sqlite_db_config.patch
+ # JDK-8257794: Zero: assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1) failed: wrong on Linux/x86_32
+ Patch581: jdk8257794-remove_broken_assert.patch
  #############################################
  #
-Line 1430 
 BuildRequires: pkgconfig
+Line 1463 
 BuildRequires: pkgconfig
  BuildRequires: x11-proto-devel
  BuildRequires: zip
  BuildRequires: unzip
- BuildRequires: java-1.8.0-openjdk-devel
+ BuildRequires: java-%{buildjdkver}-openjdk-devel
  # Zero-assembler build requirement
- %ifnarch %{jit_arches}
+ %ifarch %{zero_arches}
  BuildRequires: libffi-devel
  %endif
  # 2021c required as of JDK-8260356 in April CPU
  BuildRequires: tzdata-java >= 2021c
  # Earlier versions have a bug in tree vectorization on PPC
  BuildRequires: gcc >= 4.8.3-8
+ BuildRequires: rootcerts-java
  %if %{with_systemtap}
  BuildRequires: systemtap-sdt-devel
  %endif
-Line 1787 
 sh %{SOURCE12}
+Line 1820 
 sh %{SOURCE12}
  %patch111
  %patch112
  %patch580
+ %patch581
  # RPM-only fixes
  %patch539
  %patch600
-Line 1810 
 cp -r tapset tapset%{debug_suffix}
+Line 1843 
 cp -r tapset tapset%{debug_suffix}
  cp -r tapset tapset%{fastdebug_suffix}
  %endif
+ echo "DEBUG"
+ echo "DEBUG"
+ ls /usr/lib/jvm/java-1.8.0-openjdk/jre/lib/security/
+ echo "DEBUG"
+ echo "DEBUG"
  for suffix in %{build_loop} ; do
    for file in "tapset"$suffix/*.in; do
      OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
-Line 1888 
 export EXTRA_CFLAGS EXTRA_ASFLAGS
+Line 1925 
 export EXTRA_CFLAGS EXTRA_ASFLAGS
  function buildjdk() {
      local outputdir=${1}
-     local installdir=${2}
+     local buildjdk=${2}
-     local buildjdk=${3}
+     local maketargets="${3}"
-     local maketargets=${4}
+     local debuglevel=${4}
-     local debuglevel=${5}
      local top_srcdir_abs_path=$(pwd)/%{top_level_dir_name}
      # Variable used in hs_err hook on build failures
-Line 1901 
 function buildjdk() {
+Line 1937 
 function buildjdk() {
      ${buildjdk}/bin/java -version
      echo "Building 8u%{updatever}-%{buildver}, milestone %{milestone}"
-     mkdir -p ${outputdir} ${installdir}
+     mkdir -p ${outputdir}
      pushd ${outputdir}
      bash ${top_srcdir_abs_path}/configure \
-Line 1910 
 function buildjdk() {
+Line 1946 
 function buildjdk() {
  %else
      --disable-jfr \
  %endif
- %ifnarch %{jit_arches}
+  %ifarch %{zero_arches}
      --with-jvm-variants=zero \
  %endif
      --with-native-debug-symbols=internal \
-Line 1945 
 function buildjdk() {
+Line 1981 
 function buildjdk() {
          SCTP_WERROR= \
          ${maketargets} || ( pwd; find ${top_srcdir_abs_path} ${top_builddir_abs_path} -name "hs_err_pid*.log" | xargs cat && false )
-     # the build (erroneously) removes read permissions from some jars
+ popd
-     # this is a regression in OpenJDK 7 (our compiler):
+ }
-     # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437
+  function installjdk() {
-     find images/%{jdkimage} -iname '*.jar' -exec chmod ugo+r {} \;
+     local outputdir=${1}
-     chmod ugo+r images/%{jdkimage}/lib/ct.sym
+     local installdir=${2}
+     local imagepath=${installdir}/images/%{jdkimage}
-     # remove redundant *diz and *debuginfo files
-     find images/%{jdkimage} -iname '*.diz' -exec rm -v {} \;
-     find images/%{jdkimage} -iname '*.debuginfo' -exec rm -v {} \;
-     # Build screws up permissions on binaries
-     # https://bugs.openjdk.java.net/browse/JDK-8173610
-     find images/%{jdkimage} -iname '*.so' -exec chmod +x {} \;
-     find images/%{jdkimage}/bin/ -exec chmod +x {} \;
-     popd >& /dev/null
      echo "Installing build from ${outputdir} to ${installdir}..."
+     mkdir -p ${installdir}
      echo "Installing images..."
      mv ${outputdir}/images ${installdir}
      if [ -d ${outputdir}/bundles ] ; then
-Line 1978 
 function buildjdk() {
+Line 2005 
 function buildjdk() {
      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 {} \;
+     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
  for suffix in %{build_loop} ; do
  if [ "x$suffix" = "x" ] ; then
    debugbuild=release
-Line 1988 
 else
+Line 2042 
 else
    debugbuild=`echo $suffix  | sed "s/-//g"`
  fi
- systemjdk=/usr/lib/jvm/java-openjdk
  builddir=%{buildoutputdir -- $suffix}
  bootbuilddir=boot${builddir}
  installdir=%{installoutputdir -- $suffix}
-Line 2006 
 else
+Line 2059 
 else
  fi
  if ${run_bootstrap} ; then
-   buildjdk ${bootbuilddir} ${bootinstalldir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild}
+   buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild}
-   buildjdk ${builddir} ${installdir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild}
+   installjdk ${bootbuilddir} ${bootinstalldir}
+   buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild}
+   installjdk ${builddir} ${installdir}
    %{!?with_artifacts:rm -rf ${bootinstalldir}}
  else
-   buildjdk ${builddir} ${installdir} ${systemjdk} "${maketargets}" ${debugbuild}
+   buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild}
+   installjdk ${builddir} ${installdir}
  fi
  # Install nss.cfg right away as we will be using the JRE above
-Line 2131 
 end
+Line 2187 
 end
  run -version
  EOF
+ %ifarch %{gdb_arches}
  grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
+ %endif
  # Check src.zip has all sources. See RHBZ#1130490
  jar -tf $JAVA_HOME/src.zip | grep 'sun.misc.Unsafe'

 Legend:



Removed from v.1860410
 


changed lines


 
Added in v.1860587
 Legend:



Removed from v.1860410
 


changed lines


 
Added in v.1860587
-Removed from v.1860410
+Added in v.1860587

	ViewVC Help
Powered by ViewVC 1.1.30