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

Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/java-1.8.0-openjdk

Browse Source
This commit is contained in:
Jiri Vanek 2018-06-21 15:28:57 +02:00
commit 14507bf105
1 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
java-1.8.0-openjdk.spec
View File

@ -1,3 +1,26 @@
# RPM conditionals so as to be able to dynamically produce
# slowdebug/release builds. See:
# http://rpm.org/user_doc/conditional_builds.html
#
# Examples:
#
# Produce release *and* slowdebug builds on x86_64 (default):
# $ rpmbuild -ba java-1.8.0-openjdk.spec
#
# Produce only release builds (no slowdebug builds) on x86_64:
# $ rpmbuild -ba java-1.8.0-openjdk.spec --without slowdebug
#
# Only produce a release build on x86_64:
# $ fedpkg mockbuild --without slowdebug
#
# Only produce a debug build on x86_64:
# $ fedpkg local --without release
#
# Enable slowdebug builds by default on relevant arches.
%bcond_without slowdebug
# Enable release builds by default on relevant arches.
%bcond_without release
%define _find_debuginfo_opts -g %define _find_debuginfo_opts -g
# note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros # note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros
# also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch # also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch
@ -14,8 +37,12 @@
%global debug_on with full debug on %global debug_on with full debug on
%global for_debug for packages with debug on %global for_debug for packages with debug on
# by default we build normal build %if %{with release}
%global include_normal_build 1 %global include_normal_build 1
%else
%global include_normal_build 0
%endif
%if %{include_normal_build} %if %{include_normal_build}
%global build_loop1 %{normal_suffix} %global build_loop1 %{normal_suffix}
%else %else
@ -30,6 +57,7 @@
%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64}
# By default, we build a debug build during main build on JIT architectures # By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
%ifarch %{jit_arches} %ifarch %{jit_arches}
%ifnarch %{arm} %ifnarch %{arm}
%global include_debug_build 1 %global include_debug_build 1
@ -39,6 +67,9 @@
%else %else
%global include_debug_build 0 %global include_debug_build 0
%endif %endif
%else
%global include_debug_build 0
%endif
# On x86_64 and AArch64, we use the Shenandoah HotSpot # On x86_64 and AArch64, we use the Shenandoah HotSpot
%ifarch x86_64 %{aarch64} %ifarch x86_64 %{aarch64}
@ -1456,7 +1487,7 @@ else
exit 12 exit 12
fi fi
if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 ] ; then if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 ] ; then
echo "You have disabled both include_debug_build and include_debug_build. That is a no go." echo "You have disabled both include_debug_build and include_normal_build. That is a no go."
exit 13 exit 13
fi fi
%setup -q -c -n %{uniquesuffix ""} -T -a 0 %setup -q -c -n %{uniquesuffix ""} -T -a 0
@ -2231,6 +2262,9 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Wed Jun 20 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.172-11.b11
- Expose release/slowdebug builds being produced via conditionals.
* Wed Jun 20 2018 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.172-11.b11 * Wed Jun 20 2018 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.172-11.b11
- Add additional fix (PR3601) to fix -Wreturn-type failures introduced by 8061651 - Add additional fix (PR3601) to fix -Wreturn-type failures introduced by 8061651
- Backport 8064786 (PR3601) to fix -Wreturn-type failure on debug builds. - Backport 8064786 (PR3601) to fix -Wreturn-type failure on debug builds.