Djam/java-11-openjdk
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/java-11-openjdk.git synced 2025-02-23 21:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try to fix building with binary jdk, bootcycle-images is not buildable

Browse source
This commit is contained in:
Mikhail Novosyolov 2020-07-13 12:50:18 +03:00
parent 26f9b59d6c
commit 34aede3d18
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
java-11-openjdk.spec
View file

@ -29,8 +29,8 @@
#use the standard one from java (temporarily) #use the standard one from java (temporarily)
%bcond_with timezonejava %bcond_with timezonejava
%bcond_with binary
%bcond_without clang %bcond_without clang
%bcond_with bootstrap
# The -g flag says to use strip -g instead of full strip on DSOs or EXEs. # 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. # This fixes detailed NMT and other tools which need minimal debug info.
@ -125,13 +125,7 @@
# is expected in one single case at the end of the build # is expected in one single case at the end of the build
%global rev_build_loop %{build_loop2} %{build_loop1} %global rev_build_loop %{build_loop2} %{build_loop1}
%ifarch %{jit_arches} %if %{without bootstrap}
%global bootstrap_build 1
%else
%global bootstrap_build 1
%endif
%if %{bootstrap_build}
%global release_targets bootcycle-images static-libs-image docs-zip %global release_targets bootcycle-images static-libs-image docs-zip
%else %else
%global release_targets images docs-zip static-libs-image %global release_targets images docs-zip static-libs-image
@ -1551,7 +1545,7 @@ bash ../configure \
--with-vendor-url="https://www.redhat.com/" \ --with-vendor-url="https://www.redhat.com/" \
--with-vendor-bug-url="%{bugs}" \ --with-vendor-bug-url="%{bugs}" \
--with-vendor-vm-bug-url="%{bugs}" \ --with-vendor-vm-bug-url="%{bugs}" \
%if ! %{with binary} %if ! %{with bootstrap}
--with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \ --with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
%else %else
--with-boot-jdk="%{_builddir}/jdk-11.0.7+10" \ --with-boot-jdk="%{_builddir}/jdk-11.0.7+10" \