Compare commits
4 Commits
rawhide
...
f40-riscv6
Author | SHA1 | Date | |
---|---|---|---|
aeca46ae0a | |||
78e51fa769 | |||
c1bf21ca03 | |||
|
32252741f8 |
@ -127,11 +127,11 @@
|
||||
# Set of architectures which support multiple ABIs
|
||||
%global multilib_arches %{power64} sparc64 x86_64
|
||||
# Set of architectures for which we build slowdebug builds
|
||||
%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x
|
||||
%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x riscv64
|
||||
# Set of architectures for which we build fastdebug builds
|
||||
%global fastdebug_arches x86_64 ppc64le aarch64
|
||||
%global fastdebug_arches x86_64 ppc64le aarch64 riscv64
|
||||
# Set of architectures with a Just-In-Time (JIT) compiler
|
||||
%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64
|
||||
%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 riscv64
|
||||
# Set of architectures which use the Zero assembler port (!jit_arches)
|
||||
%global zero_arches ppc s390
|
||||
# Set of architectures which run a full bootstrap cycle
|
||||
@ -139,17 +139,17 @@
|
||||
# Set of architectures which support SystemTap tapsets
|
||||
%global systemtap_arches %{jit_arches}
|
||||
# Set of architectures with a Ahead-Of-Time (AOT) compiler
|
||||
%global aot_arches x86_64 %{aarch64}
|
||||
%global aot_arches x86_64 %{aarch64} riscv64
|
||||
# Set of architectures which support the serviceability agent
|
||||
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm}
|
||||
%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} riscv64
|
||||
# Set of architectures which support class data sharing
|
||||
# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific
|
||||
# However, it does segfault on the Zero assembler port, so currently JIT only
|
||||
%global share_arches %{jit_arches}
|
||||
# Set of architectures for which we build the Shenandoah garbage collector
|
||||
%global shenandoah_arches x86_64 %{aarch64}
|
||||
%global shenandoah_arches x86_64 %{aarch64} riscv64
|
||||
# Set of architectures for which we build the Z garbage collector
|
||||
%global zgc_arches x86_64
|
||||
%global zgc_arches x86_64 riscv64
|
||||
# Set of architectures for which alt-java has SSB mitigation
|
||||
%global ssbd_arches x86_64
|
||||
# Set of architectures for which java has short vector math library (libjsvml.so)
|
||||
@ -304,6 +304,10 @@
|
||||
%global archinstall aarch64
|
||||
%global stapinstall arm64
|
||||
%endif
|
||||
%ifarch riscv64
|
||||
%global archinstall riscv64
|
||||
%global stapinstall %{_target_cpu}
|
||||
%endif
|
||||
# 32 bit sparc, optimized for v9
|
||||
%ifarch sparcv9
|
||||
%global archinstall sparc
|
||||
@ -338,7 +342,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 22
|
||||
%global buildjdkver 21
|
||||
# We don't add any LTS designator for STS packages (Fedora and EPEL).
|
||||
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
|
||||
%if 0%{?rhel} && !0%{?epel}
|
||||
@ -398,7 +402,7 @@
|
||||
%global top_level_dir_name %{vcstag}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 36
|
||||
%global rpmrelease 2
|
||||
%global rpmrelease 3
|
||||
#%%global tagsuffix %%{nil}
|
||||
# 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
|
||||
@ -565,7 +569,7 @@ Version: %{newjavaver}.%{buildver}
|
||||
# This package needs `.rolling` as part of Release so as to not conflict on install with
|
||||
# java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as
|
||||
# java-X-openjdk. See: https://bugzilla.redhat.com/show_bug.cgi?id=1647298
|
||||
Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?dist}
|
||||
Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling.1.riscv64%{?dist}
|
||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||
# also included the epoch in their virtual provides. This created a
|
||||
@ -754,7 +758,7 @@ BuildRequires: javapackages-tools
|
||||
BuildRequires: java-%{buildjdkver}-%{origin}%{?pkgos:-%{pkgos}}-devel
|
||||
%else
|
||||
BuildRequires: javapackages-filesystem
|
||||
BuildRequires: java-latest-openjdk-devel
|
||||
BuildRequires: java-21-openjdk-devel
|
||||
%endif
|
||||
# Zero-assembler build requirement
|
||||
%ifarch %{zero_arches}
|
||||
@ -1041,7 +1045,7 @@ export NUM_PROC=${NUM_PROC:-1}
|
||||
[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
|
||||
%endif
|
||||
|
||||
%ifarch s390x sparc64 alpha %{power64} %{aarch64}
|
||||
%ifarch s390x sparc64 alpha %{power64} %{aarch64} riscv64
|
||||
export ARCH_DATA_MODEL=64
|
||||
%endif
|
||||
%ifarch alpha
|
||||
@ -1780,6 +1784,15 @@ done
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Mar 13 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1:22.0.0.0.36-3.rolling.1.riscv64
|
||||
- Bootstrap using JDK 21
|
||||
|
||||
* Tue Mar 12 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1:22.0.0.0.36-3.rolling.0.riscv64
|
||||
- Expand riscv64 configuration
|
||||
|
||||
* Wed Feb 21 2024 Songsong Zhang <U2FsdGVkX1@gmail.com> - 1:22.0.0.0.36-3.rolling
|
||||
- Add riscv64 support
|
||||
|
||||
* Fri Feb 16 2024 Jiri Vanek <jvanek@redhat.com> - 1:22.0.0.0.36-2.rolling
|
||||
- bumped build jdk to 22
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user