This commit is contained in:
parent
bcb86f04cf
commit
77e66b3cef
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 7 06:25:32 UTC 2014 - fstrba@suse.com
|
||||
|
||||
- Force Zero VM for aarch64, since from the beginning we did not
|
||||
manage to finish a build of Hotspot for this architecture.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 2 14:57:03 UTC 2014 - fstrba@suse.com
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
%global debug 0
|
||||
%global bootcycle 1
|
||||
%global jit_arches %ix86 x86_64 aarch64 ppc64 ppc64le
|
||||
%global jit_arches %ix86 x86_64 ppc64 ppc64le
|
||||
%global buildoutputdir build
|
||||
# Convert an absolute path to a relative path. Each symbolic link is
|
||||
# specified relative to the directory in which it is installed so that
|
||||
@ -64,6 +64,9 @@
|
||||
# real file made by update-ca-certificates
|
||||
%global javacacerts %{_var}/lib/ca-certificates/java-cacerts
|
||||
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
|
||||
%ifnarch %{jit_arches}
|
||||
%global _with_zero 1
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
%global archinstall amd64
|
||||
%endif
|
||||
@ -124,6 +127,7 @@
|
||||
%else
|
||||
%global with_pulseaudio 0
|
||||
%endif
|
||||
%bcond_with zero
|
||||
%if %{with_systemtap}
|
||||
# Where to install systemtap tapset (links)
|
||||
# We would like these to be in a package specific subdir,
|
||||
@ -400,10 +404,14 @@ need to.
|
||||
%setup -q -n %{root_repository}-%{root_revision}
|
||||
%setup -q -D -n %{root_repository}-%{root_revision} -T -a 1
|
||||
%ifarch %{aarch64}
|
||||
%if ! %{with zero}
|
||||
%setup -q -D -n %{root_repository}-%{root_revision} -T -a 8
|
||||
%else
|
||||
%setup -q -D -n %{root_repository}-%{root_revision} -T -a 2
|
||||
%endif
|
||||
%else
|
||||
%setup -q -D -n %{root_repository}-%{root_revision} -T -a 2
|
||||
%endif
|
||||
%setup -q -D -n %{root_repository}-%{root_revision} -T -a 3
|
||||
%setup -q -D -n %{root_repository}-%{root_revision} -T -a 4
|
||||
%setup -q -D -n %{root_repository}-%{root_revision} -T -a 5
|
||||
@ -419,10 +427,14 @@ pwd
|
||||
mv corba-%{corba_revision} corba
|
||||
|
||||
%ifarch %{aarch64}
|
||||
%if ! %{with zero}
|
||||
mv hotspot-%{aarch64_hotspot_revision} hotspot
|
||||
%else
|
||||
mv hotspot-%{hotspot_revision} hotspot
|
||||
%endif
|
||||
%else
|
||||
mv hotspot-%{hotspot_revision} hotspot
|
||||
%endif
|
||||
mv jaxp-%{jaxp_revision} jaxp
|
||||
mv jaxws-%{jaxws_revision} jaxws
|
||||
mv jdk-%{jdk_revision} jdk
|
||||
@ -542,7 +554,7 @@ mkdir -p %{buildoutputdir}
|
||||
pushd %{buildoutputdir}
|
||||
|
||||
bash ../configure \
|
||||
%ifnarch %{jit_arches}
|
||||
%if %{with zero}
|
||||
--with-jvm-variants=zero \
|
||||
%endif
|
||||
--disable-zip-debug-info \
|
||||
|
Loading…
x
Reference in New Issue
Block a user