rpms/java-11-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use the "reverse" build loop (debug first) as the main and only build loop to get more diagnostics.

Browse Source 
Remove restriction on disabling product build, as debug packages no longer have javadoc packages.
This commit is contained in:
Andrew Hughes 2021-07-02 17:55:19 +01:00
parent 0ff03bc290
commit bcc8874fb1
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java-11-openjdk.spec
View File

@ -176,10 +176,8 @@
%endif %endif
# If you disable both builds, then the build fails # If you disable both builds, then the build fails
# Note that the debug build requires the normal build for docs # Build and test slowdebug first as it provides the best diagnostics
%global build_loop %{normal_build} %{fastdebug_build} %{slowdebug_build} %global build_loop %{slowdebug_build} %{fastdebug_build} %{normal_build}
# Test slowdebug first as it provides the best diagnostics
%global rev_build_loop %{slowdebug_build} %{fastdebug_build} %{normal_build}
%if %{include_staticlibs} %if %{include_staticlibs}
%global staticlibs_loop %{staticlibs_suffix} %global staticlibs_loop %{staticlibs_suffix}
@ -345,7 +343,7 @@
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup %global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 2 %global buildver 2
%global rpmrelease 0 %global rpmrelease 1
#%%global tagsuffix "" #%%global tagsuffix ""
# 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 # 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 %if %is_system_jdk
@ -1589,10 +1587,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." echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go."
exit 14 exit 14
fi 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 %setup -q -c -n %{uniquesuffix ""} -T -a 0
# https://bugzilla.redhat.com/show_bug.cgi?id=1189084 # https://bugzilla.redhat.com/show_bug.cgi?id=1189084
prioritylength=`expr length %{priority}` prioritylength=`expr length %{priority}`
@ -1832,7 +1826,7 @@ done # end of release / debug cycle loop
%check %check
# We test debug first as it will give better diagnostics on a crash # 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}} top_dir_abs_main_build_path=$(pwd)/%{buildoutputdir -- ${suffix}%{main_suffix}}
%if %{include_staticlibs} %if %{include_staticlibs}
@ -2320,6 +2314,10 @@ cjc.mainProgram(args)
%endif %endif
%changelog %changelog
* Fri Jul 02 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.12.0.2-0.1.ea
- 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.
* Fri Jul 02 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.12.0.2-0.0.ea * Fri Jul 02 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.12.0.2-0.0.ea
- Update to jdk-11.0.12.0+2 - Update to jdk-11.0.12.0+2
- Update release notes to 11.0.12.0+2 - Update release notes to 11.0.12.0+2