Compare commits
9 Commits
rawhide
...
f40-riscv6
Author | SHA1 | Date | |
---|---|---|---|
c55a0f9663 | |||
0259fb6e45 | |||
6a897a3a9c | |||
c89b101867 | |||
825c11e321 | |||
b2e4b52b83 | |||
0b2701b29d | |||
116c7e0e0e | |||
|
4f40984078 |
@ -91,7 +91,7 @@
|
|||||||
|
|
||||||
# while JDK is a techpreview(is_system_jdk=0), some provides are turned off. Once jdk stops to be an techpreview, move it to 1
|
# while JDK is a techpreview(is_system_jdk=0), some provides are turned off. Once jdk stops to be an techpreview, move it to 1
|
||||||
# as sytem JDK, we mean any JDK which can run whole system java stack without issues (like bytecode issues, module issues, dependencies...)
|
# as sytem JDK, we mean any JDK which can run whole system java stack without issues (like bytecode issues, module issues, dependencies...)
|
||||||
%global is_system_jdk 0
|
%global is_system_jdk 1
|
||||||
|
|
||||||
%global aarch64 aarch64 arm64 armv8
|
%global aarch64 aarch64 arm64 armv8
|
||||||
# we need to distinguish between big and little endian PPC64
|
# we need to distinguish between big and little endian PPC64
|
||||||
@ -100,26 +100,26 @@
|
|||||||
# Set of architectures which support multiple ABIs
|
# Set of architectures which support multiple ABIs
|
||||||
%global multilib_arches %{power64} sparc64 x86_64
|
%global multilib_arches %{power64} sparc64 x86_64
|
||||||
# Set of architectures for which we build slowdebug builds
|
# 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
|
# 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
|
# 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)
|
# Set of architectures which use the Zero assembler port (!jit_arches)
|
||||||
%global zero_arches ppc s390
|
%global zero_arches ppc s390
|
||||||
# Set of architectures which support SystemTap tapsets
|
# Set of architectures which support SystemTap tapsets
|
||||||
%global systemtap_arches %{jit_arches}
|
%global systemtap_arches %{jit_arches}
|
||||||
# Set of architectures with a Ahead-Of-Time (AOT) compiler
|
# 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
|
# 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
|
||||||
# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific
|
# 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
|
# However, it does segfault on the Zero assembler port, so currently JIT only
|
||||||
%global share_arches %{jit_arches}
|
%global share_arches %{jit_arches}
|
||||||
# Set of architectures for which we build the Shenandoah garbage collector
|
# 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
|
# 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
|
# Set of architectures for which alt-java has SSB mitigation
|
||||||
%global ssbd_arches x86_64
|
%global ssbd_arches x86_64
|
||||||
# Set of architectures for which java has short vector math library (libsvml.so)
|
# Set of architectures for which java has short vector math library (libsvml.so)
|
||||||
@ -256,6 +256,10 @@
|
|||||||
%global archinstall aarch64
|
%global archinstall aarch64
|
||||||
%global stapinstall arm64
|
%global stapinstall arm64
|
||||||
%endif
|
%endif
|
||||||
|
%ifarch riscv64
|
||||||
|
%global archinstall riscv64
|
||||||
|
%global stapinstall %{_target_cpu}
|
||||||
|
%endif
|
||||||
# 32 bit sparc, optimized for v9
|
# 32 bit sparc, optimized for v9
|
||||||
%ifarch sparcv9
|
%ifarch sparcv9
|
||||||
%global archinstall sparc
|
%global archinstall sparc
|
||||||
@ -331,7 +335,7 @@
|
|||||||
%global top_level_dir_name %{vcstag}
|
%global top_level_dir_name %{vcstag}
|
||||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||||
%global buildver 13
|
%global buildver 13
|
||||||
%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
|
# 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
|
%if %is_system_jdk
|
||||||
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
|
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
|
||||||
@ -1253,7 +1257,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
|
|||||||
|
|
||||||
Name: java-21-%{origin}
|
Name: java-21-%{origin}
|
||||||
Version: %{newjavaver}.%{buildver}
|
Version: %{newjavaver}.%{buildver}
|
||||||
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1
|
Release: %{?eaprefix}%{rpmrelease}%{?extraver}.0.riscv64%{?dist}
|
||||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
# 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
|
# 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
|
# also included the epoch in their virtual provides. This created a
|
||||||
@ -1984,7 +1988,8 @@ for suffix in %{build_loop} ; do
|
|||||||
top_dir_abs_staticlibs_build_path=`ls -d $top_dir_abs_main_build_path/lib/static/*/glibc/`
|
top_dir_abs_staticlibs_build_path=`ls -d $top_dir_abs_main_build_path/lib/static/*/glibc/`
|
||||||
%endif
|
%endif
|
||||||
jdk_image=${top_dir_abs_main_build_path}
|
jdk_image=${top_dir_abs_main_build_path}
|
||||||
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/"`
|
find .
|
||||||
|
src_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.sources.noarch/" | sed "s/%{_arch}/noarch/3"`
|
||||||
misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.misc.%{_arch}/"`
|
misc_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.misc.%{_arch}/"`
|
||||||
docs_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.docs.%{_arch}/"`
|
docs_image=`echo ${top_dir_abs_main_build_path} | sed "s/portable.*.%{_arch}/portable.docs.%{_arch}/"`
|
||||||
|
|
||||||
@ -2416,6 +2421,13 @@ cjc.mainProgram(args)
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 12 2024 David Abdurachmanov <davidlt@rivosinc.com> - 1:21.0.2.0.13-2.0.riscv64
|
||||||
|
- Add riscv64
|
||||||
|
|
||||||
|
* Thu Feb 15 2024 Petra Alice Mikova <pmikova@redhat.com> - 1:21.0.2.0.13-2
|
||||||
|
- make this package system jdk
|
||||||
|
- fix release issue introduced by automatic rebuild
|
||||||
|
|
||||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:21.0.2.0.13-1.1
|
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:21.0.2.0.13-1.1
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user