Remove boot JDKs in favour of OpenJDK 17 build now in the buildroot.
Update buildjdkver to 17 so as to build with itself Resolves: rhbz#1870625
This commit is contained in:
Andrew Hughes
parent
913d7c9e5b
commit
780eb3f7a9
@ -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 0
|
||||
%global rpmrelease 1
|
||||
# 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.f34.aarch64.tar.xz
|
||||
Source2: jdk-16.0.1.0.9.f34.ppc64le.tar.xz
|
||||
Source3: jdk-16.0.1.0.9.f34.s390x.tar.xz
|
||||
Source4: jdk-16.0.1.0.9.f34.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 \
|
||||
@ -2252,6 +2228,14 @@ cjc.mainProgram(args)
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jun 25 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.0.0.26-0.1.ea
|
||||
- Remove boot JDKs in favour of OpenJDK 17 build now in the buildroot.
|
||||
- Resolves: rhbz#1870625
|
||||
|
||||
* Thu Jun 24 2021 Severin Gehwolf <sgehwolf@redhat.com> - 1:17.0.0.0.26-0.1.ea
|
||||
- Update buildjdkver to 17 so as to build with itself
|
||||
- Resolves: rhbz#1870625
|
||||
|
||||
* Mon Jun 21 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.0.0.26-0.0.ea
|
||||
- Rename to java-17-openjdk and bootstrap using boot JDK in local sources
|
||||
- Exclude x86 as this is not supported by OpenJDK 17
|
||||
|
||||
4
sources
4
sources
@ -1,6 +1,2 @@
|
||||
SHA512 (jdk-16.0.1.0.9.f34.aarch64.tar.xz) = f0b7036f6e2fe869ffde5addcdab0370a6852068253281d9007891c21d81f364b28b829ed3a9aa6e3fc436b5f851ba9152271956898750affba095d2ce073f70
|
||||
SHA512 (jdk-16.0.1.0.9.f34.ppc64le.tar.xz) = a8c03c9922eb11f3b71caa675dd65340051c44ba111735c7f7561c442a84f03776c3ca6caea4bc4ff7c71f4743fe7e13d807cb66967edfd54b68d91cd96731bd
|
||||
SHA512 (jdk-16.0.1.0.9.f34.s390x.tar.xz) = 6242e55799bfc8017d941d5beaba80802f371281734a5760d0db6cd3a15e278e0a5e8ee588a2d17ddca2190939d71caef1e9e5379557fc7d53ae0941f47e149c
|
||||
SHA512 (jdk-16.0.1.0.9.f34.x86_64.tar.xz) = 9c2322e5635654890ea050910412f332598a8fdf018554d371c34039094be85863beefc26f4e763eb3f20ae8eb35fe3c76e12bdd06acc3a7ba389fd5b3ef0f08
|
||||
SHA512 (openjdk-jdk17-jdk-17+26.tar.xz) = a400889ba4f141ecf29e46e42f2b2a07ba6df0760502467e7925a31e88ec6fa07deec99f919a42fd673b30df5c86f2adf5e0dcb00687404f0715527b79f2fec7
|
||||
SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
|
||||
|
||||
Loading…
Reference in New Issue
Block a user