import java-17-openjdk-17.0.0.0.26-0.2.ea.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
0c5ce1025b
commit
c3a0375880
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,6 +1,2 @@
|
||||
SOURCES/jdk-16.0.1.0.9.el8.aarch64.tar.xz
|
||||
SOURCES/jdk-16.0.1.0.9.el8.ppc64le.tar.xz
|
||||
SOURCES/jdk-16.0.1.0.9.el8.s390x.tar.xz
|
||||
SOURCES/jdk-16.0.1.0.9.el8.x86_64.tar.xz
|
||||
SOURCES/openjdk-jdk17-jdk-17+26.tar.xz
|
||||
SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
||||
|
||||
@ -1,6 +1,2 @@
|
||||
de9c1b9fcdf3dc6579aa7e189828ac4e0714d30f SOURCES/jdk-16.0.1.0.9.el8.aarch64.tar.xz
|
||||
beeb603c3b9571e3369c3900a8449894aa40f093 SOURCES/jdk-16.0.1.0.9.el8.ppc64le.tar.xz
|
||||
39f8fa6921736e9ed2607f19fbf0e36d26fd77a3 SOURCES/jdk-16.0.1.0.9.el8.s390x.tar.xz
|
||||
0637e91690ae56972b7666eacb2e9b28ecb4c2af SOURCES/jdk-16.0.1.0.9.el8.x86_64.tar.xz
|
||||
b24a772841e1adc95eedd2d3d0be5d65e7a41263 SOURCES/openjdk-jdk17-jdk-17+26.tar.xz
|
||||
7ae2cba67467825b2c2a5fec7aea041865023002 SOURCES/tapsets-icedtea-3.15.0.tar.xz
|
||||
|
||||
@ -285,7 +285,7 @@
|
||||
# buildjdkver is usually same as %%{featurever},
|
||||
# but in time of bootstrap of next jdk, it is featurever-1,
|
||||
# and this it is better to change it here, on single place
|
||||
%global buildjdkver 16
|
||||
%global buildjdkver 17
|
||||
# We don't add any LTS designator for STS packages (this package).
|
||||
# Neither for Fedora nor EPEL which would have %%{rhel} macro defined.
|
||||
%global lts_designator ""
|
||||
@ -300,7 +300,7 @@
|
||||
%global top_level_dir_name %{origin}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 26
|
||||
%global rpmrelease 1
|
||||
%global rpmrelease 2
|
||||
# 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
|
||||
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
|
||||
@ -1111,12 +1111,6 @@ URL: http://openjdk.java.net/
|
||||
Source0: openjdk-jdk%{featurever}-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}.tar.xz
|
||||
#Source0: openjdk-jdk%{featurever}-jdk-%{filever}+%{buildver}.tar.xz
|
||||
|
||||
# Bootstrap JDKs
|
||||
Source1: jdk-16.0.1.0.9.el8.aarch64.tar.xz
|
||||
Source2: jdk-16.0.1.0.9.el8.ppc64le.tar.xz
|
||||
Source3: jdk-16.0.1.0.9.el8.s390x.tar.xz
|
||||
Source4: jdk-16.0.1.0.9.el8.x86_64.tar.xz
|
||||
|
||||
# Use 'icedtea_sync.sh' to update the following
|
||||
# They are based on code contained in the IcedTea project (3.x).
|
||||
# Systemtap tapsets. Zipped up to keep it small.
|
||||
@ -1203,8 +1197,7 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: xorg-x11-proto-devel
|
||||
BuildRequires: zip
|
||||
BuildRequires: javapackages-filesystem
|
||||
# Use local source JDK until we have a build in the buildroot
|
||||
#BuildRequires: java-17-openjdk-devel
|
||||
BuildRequires: java-17-openjdk-devel
|
||||
# Zero-assembler build requirement
|
||||
%ifnarch %{jit_arches}
|
||||
BuildRequires: libffi-devel
|
||||
@ -1573,21 +1566,6 @@ done
|
||||
# Setup nss.cfg
|
||||
sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg
|
||||
|
||||
# Unpack bootstrap JDK
|
||||
%ifarch %{aarch64}
|
||||
tar -x -I xz -f %{SOURCE1}
|
||||
%endif
|
||||
%ifarch ppc64le
|
||||
tar -x -I xz -f %{SOURCE2}
|
||||
%endif
|
||||
%ifarch s390x
|
||||
tar -x -I xz -f %{SOURCE3}
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
tar -x -I xz -f %{SOURCE4}
|
||||
%endif
|
||||
# Verify it works
|
||||
${PWD}/bootjdk/bin/java -version
|
||||
|
||||
%build
|
||||
# How many CPU's do we have?
|
||||
@ -1649,8 +1627,6 @@ fi
|
||||
|
||||
top_dir_abs_src_path=$(pwd)/%{top_level_dir_name}
|
||||
top_dir_abs_build_path=$(pwd)/%{buildoutputdir -- ${suffix}${loop}}
|
||||
BOOTJDK=$(pwd)/bootjdk
|
||||
|
||||
# The OpenJDK version file includes the current
|
||||
# upstream version information. For some reason,
|
||||
# configure does not automatically use the
|
||||
@ -1687,7 +1663,7 @@ bash ${top_dir_abs_src_path}/configure \
|
||||
--with-vendor-url="https://www.redhat.com/" \
|
||||
--with-vendor-bug-url="%{bugs}" \
|
||||
--with-vendor-vm-bug-url="%{bugs}" \
|
||||
--with-boot-jdk="${BOOTJDK}" \
|
||||
--with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
|
||||
--with-debug-level=$debugbuild \
|
||||
--with-native-debug-symbols=internal \
|
||||
--enable-unlimited-crypto \
|
||||
@ -2251,6 +2227,18 @@ require "copy_jdk_configs.lua"
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jul 14 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.0.0.26-0.2.ea
|
||||
- Remove boot JDKs in favour of OpenJDK 17 build now in the buildroot.
|
||||
- Resolves: rhbz#1959487
|
||||
|
||||
* Wed Jul 14 2021 Severin Gehwolf <sgehwolf@redhat.com> - 1:17.0.0.0.26-0.2.ea
|
||||
- Update buildjdkver to 17 so as to build with itself
|
||||
- Resolves: rhbz#1959487
|
||||
|
||||
* Tue Jul 13 2021 Jiri Vanek <jvanek@redhat.com> - 1:17.0.0.0.26-0.1.ea
|
||||
- Add gating support
|
||||
- Resolves: rhbz#1959487
|
||||
|
||||
* Mon Jun 21 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.0.0.26-0.0.ea
|
||||
- Rename as java-17-openjdk and bootstrap using boot JDK in local sources
|
||||
- Exclude x86 as this is not supported by OpenJDK 17
|
||||
|
||||
Loading…
Reference in New Issue
Block a user