forked from pool/java-1_8_0-openjdk
This commit is contained in:
@@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Feb 1 12:54:10 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Don't run bootstrap build for s390, since it is broken, instead
|
||||||
|
introduce a little cycle on this platform, in order to have
|
||||||
|
working openjdk8
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Jan 29 20:44:57 UTC 2017 - fstrba@suse.com
|
Sun Jan 29 20:44:57 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
@@ -50,6 +50,11 @@
|
|||||||
# real file made by update-ca-certificates
|
# real file made by update-ca-certificates
|
||||||
%global javacacerts %{_var}/lib/ca-certificates/java-cacerts
|
%global javacacerts %{_var}/lib/ca-certificates/java-cacerts
|
||||||
# turn zero on non jit arches by default
|
# turn zero on non jit arches by default
|
||||||
|
%ifarch s390
|
||||||
|
%global _with_bootstrap 0
|
||||||
|
%else
|
||||||
|
%bcond_without bootstrap
|
||||||
|
%endif
|
||||||
%ifnarch %{jit_arches}
|
%ifnarch %{jit_arches}
|
||||||
%global _with_zero 1
|
%global _with_zero 1
|
||||||
%endif
|
%endif
|
||||||
@@ -214,7 +219,6 @@ BuildRequires: freetype2-devel
|
|||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: giflib-devel
|
BuildRequires: giflib-devel
|
||||||
BuildRequires: gtk2-devel
|
BuildRequires: gtk2-devel
|
||||||
BuildRequires: java-bootstrap-devel >= 1.7.0
|
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
BuildRequires: liblcms2-devel
|
BuildRequires: liblcms2-devel
|
||||||
BuildRequires: libpng-devel
|
BuildRequires: libpng-devel
|
||||||
@@ -261,6 +265,11 @@ Provides: jre1.6.x
|
|||||||
Provides: jre1.7.x
|
Provides: jre1.7.x
|
||||||
Provides: jre1.8.x
|
Provides: jre1.8.x
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
%if %{with bootstrap}
|
||||||
|
BuildRequires: java-bootstrap-devel >= 1.7.0
|
||||||
|
%else
|
||||||
|
BuildRequires: java-1_8_0-openjdk-devel
|
||||||
|
%endif
|
||||||
%if %{with_system_kerberos}
|
%if %{with_system_kerberos}
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
%endif
|
%endif
|
||||||
@@ -473,7 +482,11 @@ sh autogen.sh
|
|||||||
%if %{with_sunec}
|
%if %{with_sunec}
|
||||||
--enable-sunec \
|
--enable-sunec \
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with bootstrap}
|
||||||
--enable-bootstrap \
|
--enable-bootstrap \
|
||||||
|
%else
|
||||||
|
--disable-bootstrap \
|
||||||
|
%endif
|
||||||
--disable-downloading \
|
--disable-downloading \
|
||||||
--with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
|
--with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
|
||||||
%ifnarch %{arm} %{aarch64}
|
%ifnarch %{arm} %{aarch64}
|
||||||
|
Reference in New Issue
Block a user