From 7bc094fb91eca03e6f58d80dd26b1b9a02241465 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Wed, 7 Jul 2021 07:02:16 +0100 Subject: [PATCH] Use the "reverse" build loop (debug first) as the main and only build loop to get more diagnostics. Remove restriction on disabling product build, as debug packages no longer have javadoc packages. --- java-latest-openjdk.spec | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index 9963a19..995d4f2 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -170,10 +170,8 @@ %endif # If you disable both builds, then the build fails -# Note that the debug build requires the normal build for docs -%global build_loop %{normal_build} %{fastdebug_build} %{slowdebug_build} -# Test slowdebug first as it provides the best diagnostics -%global rev_build_loop %{slowdebug_build} %{fastdebug_build} %{normal_build} +# Build and test slowdebug first as it provides the best diagnostics +%global build_loop %{slowdebug_build} %{fastdebug_build} %{normal_build} %if %{include_staticlibs} %global staticlibs_loop %{staticlibs_suffix} @@ -300,7 +298,7 @@ %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 26 -%global rpmrelease 3 +%global rpmrelease 4 # 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 @@ -1493,10 +1491,6 @@ if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{includ echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go." exit 14 fi -if [ %{include_normal_build} -eq 0 ] ; then - echo "You have disabled the normal build, but this is required to provide docs for the debug build." - exit 15 -fi %setup -q -c -n %{uniquesuffix ""} -T -a 0 # https://bugzilla.redhat.com/show_bug.cgi?id=1189084 prioritylength=`expr length %{priority}` @@ -1739,7 +1733,7 @@ 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 +for suffix in %{build_loop} ; do top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}} %if %{include_staticlibs} @@ -2231,6 +2225,10 @@ cjc.mainProgram(args) %endif %changelog +* Fri Jul 02 2021 Andrew Hughes - 1:17.0.0.0.26-0.4.ea.rolling +- Use the "reverse" build loop (debug first) as the main and only build loop to get more diagnostics. +- Remove restriction on disabling product build, as debug packages no longer have javadoc packages. + * Mon Jun 28 2021 Petra Alice Mikova - 1:17.0.0.0.26-0.3.ea.rolling - fix patch rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch which made the SunPKCS provider show up again - Resolves: rhbz#1971120