/[packages]/backports/8/java-latest-openjdk/current/SPECS/java-latest-openjdk.spec

Diff of /backports/8/java-latest-openjdk/current/SPECS/java-latest-openjdk.spec

Parent Directory | Revision Log | View Patch Patch

-revision 1760751 by neoclust,
Wed Mar  3 20:46:04 2021 UTC
+revision 1760752 by neoclust,
Sat Dec  4 23:35:46 2021 UTC
 Line 1
- # synced up to c5efa6bf325647c5f5011e31462fb72a3d42e797
+ # synced up to 2891e38fa239f7fe4404264ae0a58670db64f7bb
  %define _disable_ld_no_undefined 1
  # RPM conditionals so as to be able to dynamically produce
 Line 25
  %bcond_without slowdebug
  # Enable release builds by default on relevant arches.
  %bcond_without release
+ # Enable static library builds by default.
+ %bcond_without staticlibs
  # Workaround for stripping of debug symbols from static libraries
+ %if %{with staticlibs}
  %define __brp_strip_static_archive %{nil}
+ %global include_staticlibs 1
+ %else
+ %global include_staticlibs 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.
-Line 45
+Line 52
  # (initiated in https://bugzilla.redhat.com/show_bug.cgi?id=1482192)
  %global debug_suffix_unquoted -slowdebug
  %global fastdebug_suffix_unquoted -fastdebug
+ %global main_suffix_unquoted -main
+ %global staticlibs_suffix_unquoted -staticlibs
  # quoted one for shell operations
  %global debug_suffix "%{debug_suffix_unquoted}"
  %global fastdebug_suffix "%{fastdebug_suffix_unquoted}"
  %global normal_suffix ""
+ %global main_suffix "%{main_suffix_unquoted}"
+ %global staticlibs_suffix "%{staticlibs_suffix_unquoted}"
  %global debug_warning This package is unoptimised with full debugging. Install only as needed and remove ASAP.
  %global debug_on with full debugging on
  %global fastdebug_on with minimal debugging on
  %global fastdebug_warning This package is optimised with full debugging. Install only as needed and remove ASAP.
- %global for_fastdebug for packages with minimal debugging on
+ %global for_fastdebug_on for packages with minimal debugging on
  %global for_debug for packages with debugging on
  %if %{with release}
-Line 165
+Line 176
  # Test slowdebug first as it provides the best diagnostics
  %global rev_build_loop  %{slowdebug_build} %{fastdebug_build} %{normal_build}
+ %if %{include_staticlibs}
+ %global staticlibs_loop %{staticlibs_suffix}
+ %else
+ %global staticlibs_loop %{nil}
+ %endif
  %ifarch %{bootstrap_arches}
  %global bootstrap_build 1
  %else
-Line 172
+Line 189
  %endif
  %if %{bootstrap_build}
- %global release_targets bootcycle-images static-libs-image docs-zip
+ %global release_targets bootcycle-images docs-zip
  %else
- %global release_targets images docs-zip static-libs-image
+ %global release_targets images docs-zip
  %endif
  # No docs nor bootcycle for debug builds
- %global debug_targets images static-libs-image
+ %global debug_targets images
+ %if %{include_staticlibs}
+ # Extra target for producing the static-libraries. Separate from
+ # other targets since this target is configured to use in-tree
+ # AWT dependencies: lcms, libjpeg, libpng, libharfbuzz, giflib
+ # and possibly others
+ %global static_libs_target static-libs-image
+ %endif
  # Filter out flags from the optflags macro that cause problems with the OpenJDK build
-Line 252
+Line 277
  # New Version-String scheme-style defines
  %global featurever 16
  %global interimver 0
- %global updatever 0
+ %global updatever 2
  %global patchver 0
  # If you bump featurever, you must bump also vendor_version_string
  # Used via new version scheme. JDK 16 was
-Line 261
+Line 286
  # buildjdkver is usually same as %%{featurever},
  # but in time of bootstrap of next jdk, it is featurever-1,
  # and this it is better to change it here, on single place
- %global buildjdkver 15
+ %global buildjdkver 16
  # We don't add any LTS designator for STS packages (this package).
  # Neither for Fedora nor EPEL which would have %%{rhel} macro defined.
   %global lts_designator ""
-Line 274
+Line 299
  %global origin          openjdk
  %global origin_nice     OpenJDK
  %global top_level_dir_name   %{origin}
- %global buildver        36
+ %global top_level_dir_name_backup %{top_level_dir_name}-backup
- %global rpmrelease      0
+ %global buildver        7
+ %global rpmrelease      1
  # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
  %if %is_system_jdk
  # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
-Line 324
+Line 350
  %global jdkimage                jdk
  %global static_libs_image       static-libs
  # output dir stub
- %define buildoutputdir() %{expand:openjdk/build%{?1}}
+ %define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
  # we can copy the javadoc to not arched dir, or make it not noarch
  %define uniquejavadocdir()    %{expand:%{fullversion}.%{_arch}%{?1}}
  # main id and dir of this jdk
-Line 719 
 exit 0
+Line 745 
 exit 0
  %config(noreplace) %{etcjavadir -- %{?1}}/conf/logging.properties
  %config(noreplace) %{etcjavadir -- %{?1}}/conf/security/nss.cfg
  %config(noreplace) %{etcjavadir -- %{?1}}/conf/management/jmxremote.access
- # these are config templates, thus not config-noreplace
+ # this is conifg template, thus not config-noreplace
  %config  %{etcjavadir -- %{?1}}/conf/management/jmxremote.password.template
  %config  %{etcjavadir -- %{?1}}/conf/sdp/sdp.conf.template
  %config(noreplace) %{etcjavadir -- %{?1}}/conf/management/management.properties
-Line 930 
 Requires: tzdata-java >= 2015d
+Line 956 
 Requires: tzdata-java >= 2015d
  # for support of kernel stream control
  # libsctp.so.1 is being `dlopen`ed on demand
  Requires: lksctp-tools%{?_isa}
+ %if ! 0%{?flatpak}
  # tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it,
  # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be
  # considered as regression
- Requires: copy-jdk-configs >= 3.3
+ Requires: copy-jdk-configs >= 4.0
- #OrderWithRequires: copy-jdk-configs
+ %endif
  # for printing support
- #Requires: cups-libs
+ # Requires: cups-libs
+ # for FIPS PKCS11 provider
+ Requires: nss
  # Post requires alternatives to install tool alternatives
  Requires(post):   %{alternatives_requires}
  # Postun requires alternatives to uninstall tool alternatives
-Line 960 
 Provides: java-headless%{?1} = %{epoch}:
+Line 989 
 Provides: java-headless%{?1} = %{epoch}:
  %define java_devel_rpo() %{expand:
  # Requires base package
  Requires:         %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
- #OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
  # Post requires alternatives to install tool alternatives
  Requires(post):   %{alternatives_requires}
  # Postun requires alternatives to uninstall tool alternatives
-Line 981 
 Provides: java-sdk%{?1} = %{epoch}:%{ver
+Line 1009 
 Provides: java-sdk%{?1} = %{epoch}:%{ver
  %define java_static_libs_rpo() %{expand:
  Requires:         %{name}-devel%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
- #OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
  }
  %define java_jmods_rpo() %{expand:
  # Requires devel package
  # as jmods are bytecode, they should be OK without any _isa
  Requires:         %{name}-devel%{?1} = %{epoch}:%{version}-%{release}
- #OrderWithRequires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release}
  Provides: java-%{javaver}-jmods%{?1} = %{epoch}:%{version}-%{release}
  Provides: java-%{javaver}-%{origin}-jmods%{?1} = %{epoch}:%{version}-%{release}
-Line 999 
 Provides: java-jmods%{?1} = %{epoch}:%{v
+Line 1025 
 Provides: java-jmods%{?1} = %{epoch}:%{v
  %define java_demo_rpo() %{expand:
  Requires: %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
- #OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
  Provides: java-%{javaver}-demo%{?1} = %{epoch}:%{version}-%{release}
  Provides: java-%{javaver}-%{origin}-demo%{?1} = %{epoch}:%{version}-%{release}
-Line 1010 
 Provides: java-%{origin}-demo%{?1} = %{e
+Line 1035 
 Provides: java-%{origin}-demo%{?1} = %{e
  }
  %define java_javadoc_rpo() %{expand:
- #OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
  # Post requires alternatives to install javadoc alternative
  Requires(post):   %{alternatives_requires}
  # Postun requires alternatives to uninstall javadoc alternative
-Line 1045 
 Version: %{newjavaver}.%{buildver}
+Line 1069 
 Version: %{newjavaver}.%{buildver}
  # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
  # java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298
  Release: %mkrel %{?eaprefix}%{rpmrelease}%{?extraver}.rolling.1
- Group:   Development/Java
  # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
  # and this change was brought into RHEL-4. java-1.5.0-ibm packages
  # also included the epoch in their virtual provides. This created a
-Line 1055 
 Group:   Development/Java
+Line 1078 
 Group:   Development/Java
  # satisfied by the 1:1.5.0 packages. Thus we need to set the epoch in
  # JDK package >= 1.6.0 to 1, and packages referring to JDK virtual
  # provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
+ Group:   Development/Java
  Epoch:   1
  Summary: %{origin_nice} %{featurever} Runtime Environment
-Line 1079 
 URL:      http://openjdk.java.net/
+Line 1102 
 URL:      http://openjdk.java.net/
  # to regenerate source0 (jdk) run update_package.sh
  # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
- #Source0: openjdk-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}.tar.xz
+ Source0: openjdk-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}.tar.xz
- Source0: openjdk-jdk%{featurever}-jdk-%{filever}+%{buildver}.tar.xz
+ #Source0: openjdk-jdk%{featurever}-jdk-%{filever}+%{buildver}.tar.xz
  # Use 'icedtea_sync.sh' to update the following
  # They are based on code contained in the IcedTea project (3.x).
-Line 1105 
 Source13: TestCryptoLevel.java
+Line 1128 
 Source13: TestCryptoLevel.java
  # Ensure ECDSA is working
  Source14: TestECDSA.java
+ # nss fips configuration file
+ Source15: nss.fips.cfg.in
  # Verify system crypto (policy) can be disabled via a property
- Source15: TestSecurityProperties.java
+ Source17: TestSecurityProperties.java
  ############################################
  #
-Line 1114 
 Source15: TestSecurityProperties.java
+Line 1140 
 Source15: TestSecurityProperties.java
  #
  ############################################
- # NSS via SunPKCS11 Provider (disabled comment
- # due to memory leak).
- Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
- # enable build of speculative store bypass hardened alt-java
- Patch600: rh1750419-redhat_alt_java.patch
  # Ignore AWTError when assistive technologies are loaded
  Patch1:    rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
  # Restrict access to java-atk-wrapper classes
  Patch2:    rh1648644-java_access_bridge_privileged_security.patch
+ # NSS via SunPKCS11 Provider (disabled due to memory leak).
+ Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
+ # enable build of speculative store bypass hardened alt-java
+ Patch600: rh1750419-redhat_alt_java.patch
  Patch3:    rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
  # Follow system wide crypto policy RHBZ#1249083
  Patch4:    pr3183-rh1340845-support_fedora_rhel_system_crypto_policy.patch
  # Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo
  Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
- # JDK-8259949: Use i686 instead of i586 on x86 when -fcf-protection is passed to the compiler, as CMOV is needed
+ Patch7: pr3695-toggle_system_crypto_policy.patch
- Patch8: jdk8259949-allow_cf-protection_on_x86.patch
+ # FIPS support patches
+ # RH1655466: Support RHEL FIPS mode using SunPKCS11 provider
+ Patch1001: rh1655466-global_crypto_and_fips.patch
+ # RH1818909: No ciphersuites availale for SSLSocket in FIPS mode
+ Patch1002: rh1818909-fips_default_keystore_type.patch
+ # RH1860986: Disable TLSv1.3 with the NSS-FIPS provider until PKCS#11 v3.0 support is available
+ Patch1004: rh1860986-disable_tlsv1.3_in_fips_mode.patch
+ # RH1915071: Always initialise JavaSecuritySystemConfiguratorAccess
+ Patch1007: rh1915071-always_initialise_configurator_access.patch
  #############################################
  #
-Line 1278 
 The %{origin_nice} %{featurever} develop
+Line 1311 
 The %{origin_nice} %{featurever} develop
  %{fastdebug_warning}
  %endif
+ %if %{include_staticlibs}
  %if %{include_normal_build}
  %package static-libs
  Summary: %{origin_nice} %{featurever} libraries for static linking
-Line 1310 
 The %{origin_nice} %{featurever} librari
+Line 1345 
 The %{origin_nice} %{featurever} librari
  %{fastdebug_warning}
  %endif
+ # staticlibs
+ %endif
  %if %{include_normal_build}
  %package jmods
  Summary: JMods for %{origin_nice} %{featurever}
-Line 1472 
 if [ $prioritylength -ne 8 ] ; then
+Line 1510 
 if [ $prioritylength -ne 8 ] ; then
  fi
  # OpenJDK patches
+ # Remove libraries that are linked by both static and dynamic builds
+ sh %{SOURCE12} %{top_level_dir_name}
- # Remove libraries that are linked
+ # Patch the JDK
- sh %{SOURCE12}
  pushd %{top_level_dir_name}
  %patch1 -p1
  %patch2 -p1
  %patch3 -p1
  %patch4 -p1
  %patch6 -p1
- %patch8 -p1
+ %patch7 -p1
  popd # openjdk
  %patch1000
  %patch600
+ %patch1001
+ %patch1002
+ %patch1004
+ %patch1007
  # Extract systemtap tapsets
  %if %{with_systemtap}
-Line 1534 
 done
+Line 1577 
 done
  # Setup nss.cfg
  sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg
+ # Setup nss.fips.cfg
+ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE15} > nss.fips.cfg
+ sed -i -e "s:@NSS_SECMOD@:/etc/pki/nssdb:g" nss.fips.cfg
  %build
  # How many CPU's do we have?
-Line 1571 
 else
+Line 1617 
 else
    debugbuild=`echo $suffix  | sed "s/-//g"`
  fi
- # Variable used in hs_err hook on build failures
+ for loop in %{main_suffix} %{staticlibs_loop} ; do
- top_dir_abs_path=$(pwd)/%{top_level_dir_name}
+ if test "x${loop}" = "x%{main_suffix}" ; then
+     # Copy the source tree so we can remove all in-tree libraries
+     cp -a %{top_level_dir_name} %{top_level_dir_name_backup}
+     # Remove all libraries that are linked
+     sh %{SOURCE12} %{top_level_dir_name} full
+     # Variable used by configure and hs_err hook on build failures
+     link_opt="system"
+     # Debug builds don't need same targets as release for
+     # build speed-up
+     maketargets="%{release_targets}"
+     if echo $debugbuild | grep -q "debug" ; then
+         maketargets="%{debug_targets}"
+     fi
+ else
+     # Variable used by configure and hs_err hook on build failures
+     link_opt="bundled"
+     # Static library cycle only builds the static libraries
+     maketargets="%{static_libs_target}"
+ fi
+ top_dir_abs_src_path=$(pwd)/%{top_level_dir_name}
+ top_dir_abs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}${loop}}
  # The OpenJDK version file includes the current
  # upstream version information. For some reason,
  # configure does not automatically use the
  # default pre-version supplied there (despite
  # what the file claims), so we pass it manually
  # to configure
- VERSION_FILE=${top_dir_abs_path}/make/autoconf/version-numbers
+ VERSION_FILE=${top_dir_abs_src_path}/make/autoconf/version-numbers
  if [ -f ${VERSION_FILE} ] ; then
      EA_DESIGNATOR=$(grep '^DEFAULT_PROMOTED_VERSION_PRE' ${VERSION_FILE} | cut -d '=' -f 2)
  else
-Line 1592 
 if [ "x${EA_DESIGNATOR}" != "x%{expected
+Line 1659 
 if [ "x${EA_DESIGNATOR}" != "x%{expected
      exit 17
  fi
- mkdir -p %{buildoutputdir -- $suffix}
+ mkdir -p ${top_dir_abs_build_path}
- pushd %{buildoutputdir -- $suffix}
+ pushd ${top_dir_abs_build_path}
- bash ../configure \
+ bash ${top_dir_abs_src_path}/configure \
  %ifnarch %{jit_arches}
      --with-jvm-variants=zero \
  %endif
-Line 1615 
 bash ../configure \
+Line 1682 
 bash ../configure \
      --with-native-debug-symbols=internal \
      --enable-unlimited-crypto \
      --with-zlib=system \
-     --with-libjpeg=system \
+     --with-libjpeg=${link_opt} \
-     --with-giflib=system \
+     --with-giflib=${link_opt} \
-     --with-libpng=system \
+     --with-libpng=${link_opt} \
-     --with-lcms=system \
+     --with-lcms=${link_opt} \
-     --with-harfbuzz=system \
+     --with-harfbuzz=${link_opt} \
      --with-stdc++lib=dynamic \
      --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
      --with-extra-cflags="$EXTRA_CFLAGS" \
-Line 1632 
 bash ../configure \
+Line 1699 
 bash ../configure \
  %endif
      --disable-warnings-as-errors
- # Debug builds don't need same targets as release for
- # build speed-up
- maketargets="%{release_targets}"
- if echo $debugbuild | grep -q "debug" ; then
-   maketargets="%{debug_targets}"
- fi
  make \
      JAVAC_FLAGS=-g \
      LOG=trace \
      WARNINGS_ARE_ERRORS="-Wno-error" \
      CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
-     $maketargets || ( pwd; find $top_dir_abs_path -name "hs_err_pid*.log" | xargs cat && false )
+     $maketargets || ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
+ popd >& /dev/null
+ # Restore original source tree if we modified it by removing full in-tree sources
+ if [ -d %{top_level_dir_name_backup} ] ; then
+     rm -rf %{top_level_dir_name}
+     mv %{top_level_dir_name_backup} %{top_level_dir_name}
+ fi
+ done # end of main / staticlibs loop
+ top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
  # 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 images/%{jdkimage} -iname '*.jar' -exec chmod ugo+r {} \;
+ find ${top_dir_abs_main_build_path}/images/%{jdkimage} -iname '*.jar' -exec chmod ugo+r {} \;
  # Build screws up permissions on binaries
  # https://bugs.openjdk.java.net/browse/JDK-8173610
- find images/%{jdkimage} -iname '*.so' -exec chmod +x {} \;
+ find ${top_dir_abs_main_build_path}/images/%{jdkimage} -iname '*.so' -exec chmod +x {} \;
- find images/%{jdkimage}/bin/ -exec chmod +x {} \;
+ find ${top_dir_abs_main_build_path}/images/%{jdkimage}/bin/ -exec chmod +x {} \;
- popd >& /dev/null
  # Install nss.cfg right away as we will be using the JRE above
- export JAVA_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{jdkimage}
+ export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
  # Install nss.cfg right away as we will be using the JRE above
  install -m 644 nss.cfg $JAVA_HOME/conf/security/
+ # Install nss.fips.cfg: NSS configuration for global FIPS mode (crypto-policies)
+ ##install -m 644 nss.fips.cfg $JAVA_HOME/conf/security/
  # Use system-wide tzdata
  rm $JAVA_HOME/lib/tzdb.dat
  ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/lib/tzdb.dat
-Line 1675 
 cat man/man1/java.1 >> man/man1/%{alt_ja
+Line 1749 
 cat man/man1/java.1 >> man/man1/%{alt_ja
  popd
  # build cycles
- done
+ done # end of release / debug cycle loop
  %check
  # We test debug first as it will give better diagnostics on a crash
  for suffix in %{rev_build_loop} ; do
- export JAVA_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{jdkimage}
+ top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
+ %if %{include_staticlibs}
+ top_dir_abs_staticlibs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{staticlibs_loop}}
+ %endif
+ export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
  #check Shenandoah is enabled
  %if %{use_shenandoah_hotspot}
-Line 1698 
 $JAVA_HOME/bin/javac -d . %{SOURCE14}
+Line 1777 
 $JAVA_HOME/bin/javac -d . %{SOURCE14}
  $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
  # Check system crypto (policy) can be disabled
- $JAVA_HOME/bin/javac -d . %{SOURCE15}
+ $JAVA_HOME/bin/javac -d . %{SOURCE17}
- $JAVA_HOME/bin/java -Djava.security.disableSystemPropertiesFile=true $(echo $(basename %{SOURCE15})|sed "s|\.java||") ||  echo "crypto policy are now not honored i jdk15"
+ $JAVA_HOME/bin/java -Djava.security.disableSystemPropertiesFile=true $(echo $(basename %{SOURCE17})|sed "s|\.java||") ||  echo "crypto policy are now not honored i jdk15"
  # Check java launcher has no SSB mitigation
  if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
-Line 1711 
 nm $JAVA_HOME/bin/%{alt_java_name} | gre
+Line 1790 
 nm $JAVA_HOME/bin/%{alt_java_name} | gre
  if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
  %endif
+ %if %{include_staticlibs}
  # Check debug symbols in static libraries (smoke test)
- export STATIC_LIBS_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{static_libs_image}
+ export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
  readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c
  readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c
+ %endif
  # Check debug symbols are present and can identify code
  find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
-Line 1805 
 STRIP_KEEP_SYMTAB=libjvm*
+Line 1886 
 STRIP_KEEP_SYMTAB=libjvm*
  for suffix in %{build_loop} ; do
+ top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
+ %if %{include_staticlibs}
+ top_dir_abs_staticlibs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{staticlibs_loop}}
+ %endif
+ jdk_image=${top_dir_abs_main_build_path}/images/%{jdkimage}
  # Install the jdk
  mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
- cp -a %{buildoutputdir -- $suffix}/images/%{jdkimage} \
+ cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}
-   $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}
- pushd %{buildoutputdir $suffix}/images/%{jdkimage}
+ pushd ${jdk_image}
  %if %{with_systemtap}
    # Install systemtap support files
-Line 1854 
 pushd %{buildoutputdir $suffix}/images/%
+Line 1940 
 pushd %{buildoutputdir $suffix}/images/%
  popd
  # Install static libs artefacts
+ %if %{include_staticlibs}
  mkdir -p $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib/static/linux-%{archinstall}/glibc
- cp -a %{buildoutputdir -- $suffix}/images/%{static_libs_image}/lib/*.a \
+ cp -a ${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}/lib/*.a \
    $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/lib/static/linux-%{archinstall}/glibc
+ %endif
  if ! echo $suffix | grep -q "debug" ; then
    # Install Javadoc documentation
    install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
-   cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
+   cp -a ${top_dir_abs_main_build_path}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
    built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
-   cp -a %{buildoutputdir -- $suffix}/bundles/${built_doc_archive} \
+   cp -a ${top_dir_abs_main_build_path}/bundles/${built_doc_archive} \
-      $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l %{buildoutputdir -- $suffix}/bundles/
+      $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip || ls -l ${top_dir_abs_main_build_path}/bundles/
  fi
  # Install release notes
-Line 1926 
 done
+Line 2014 
 done
  -- whether copy-jdk-configs is installed or not. If so, then configs are copied
  -- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all
  local posix = require "posix"
- local debug = false
+ if (os.getenv("debug") == "true") then
+   debug = true;
+   print("cjc: in spec debug is on")
+ else
+   debug = false;
+ end
  SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua"
  SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua"
-Line 1954 
 else
+Line 2048 
 else
    return
    end
  end
- -- run content of included file with fake args
+ arg = nil ;  -- it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua"
- arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
+ cjc = require "copy_jdk_configs.lua"
- require "copy_jdk_configs.lua"
+ args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
+ cjc.mainProgram(args)
  %post
  %{post_script %{nil}}
-Line 2067 
 require "copy_jdk_configs.lua"
+Line 2162 
 require "copy_jdk_configs.lua"
  %files devel
  %{files_devel %{nil}}
+ %if %{include_staticlibs}
  %files static-libs
  %{files_static_libs %{nil}}
+ %endif
  %files jmods
  %{files_jmods %{nil}}
-Line 2099 
 require "copy_jdk_configs.lua"
+Line 2196 
 require "copy_jdk_configs.lua"
  %files devel-slowdebug
  %{files_devel -- %{debug_suffix_unquoted}}
+ %if %{include_staticlibs}
  %files static-libs-slowdebug
  %{files_static_libs -- %{debug_suffix_unquoted}}
+ %endif
  %files jmods-slowdebug
  %{files_jmods -- %{debug_suffix_unquoted}}
-Line 2122 
 require "copy_jdk_configs.lua"
+Line 2221 
 require "copy_jdk_configs.lua"
  %files devel-fastdebug
  %{files_devel -- %{fastdebug_suffix_unquoted}}
+ %if %{include_staticlibs}
  %files static-libs-fastdebug
  %{files_static_libs -- %{fastdebug_suffix_unquoted}}
+ %endif
  %files jmods-fastdebug
  %{files_jmods -- %{fastdebug_suffix_unquoted}}

 Legend:



Removed from v.1760751
 


changed lines


 
Added in v.1760752
 Legend:



Removed from v.1760751
 


changed lines


 
Added in v.1760752
-Removed from v.1760751
+Added in v.1760752

	ViewVC Help
Powered by ViewVC 1.1.30