Sync the copy of the portable specfile with the latest update
Related: RHEL-101799
This commit is contained in:
Andrew Hughes
parent
b1fe4679f1
commit
5a24eabc45
@ -126,7 +126,7 @@
|
||||
# Set of architectures for which we build fastdebug builds
|
||||
%global fastdebug_arches x86_64 ppc64le aarch64
|
||||
# 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
|
||||
@ -136,15 +136,15 @@
|
||||
# Set of architectures with a Ahead-Of-Time (AOT) compiler
|
||||
%global aot_arches x86_64 %{aarch64}
|
||||
# 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)
|
||||
@ -161,7 +161,7 @@
|
||||
# Set of architectures for which we have a devkit
|
||||
# Only used on RHEL
|
||||
%if 0%{?centos} == 0
|
||||
%global devkit_arches %{aarch64} %{ppc64le} s390x x86_64
|
||||
%global devkit_arches %{aarch64} %{ppc64le} riscv64 s390x x86_64
|
||||
%endif
|
||||
|
||||
# By default, we build a slowdebug build during main build on JIT architectures
|
||||
@ -300,6 +300,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
|
||||
@ -325,7 +329,7 @@
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 21
|
||||
%global interimver 0
|
||||
%global updatever 7
|
||||
%global updatever 8
|
||||
%global patchver 0
|
||||
# buildjdkver is usually same as %%{featurever},
|
||||
# but in time of bootstrap of next jdk, it is featurever-1,
|
||||
@ -389,8 +393,8 @@
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{vcstag}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 6
|
||||
%global rpmrelease 2
|
||||
%global buildver 1
|
||||
%global rpmrelease 1
|
||||
#%%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
|
||||
@ -409,7 +413,7 @@
|
||||
# Release will be (where N is usually a number starting at 1):
|
||||
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
||||
# - N%%{?extraver}{?dist} for GA releases
|
||||
%global is_ga 1
|
||||
%global is_ga 0
|
||||
%if %{is_ga}
|
||||
%global build_type GA
|
||||
%global ea_designator ""
|
||||
@ -540,7 +544,7 @@
|
||||
%if 0%{?centos} == 0
|
||||
ExclusiveArch: %{devkit_arches}
|
||||
%else
|
||||
ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64
|
||||
ExclusiveArch: %{aarch64} %{ppc64le} riscv64 s390x x86_64
|
||||
%endif
|
||||
|
||||
Name: java-%{javaver}-%{origin}-portable%{?pkgos:-%{pkgos}}
|
||||
@ -673,9 +677,7 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
|
||||
#
|
||||
#############################################
|
||||
|
||||
# JDK-8351500: G1: NUMA migrations cause crashes in region allocation
|
||||
# Upstream in 21.0.8+1
|
||||
Patch2001: jdk8351500-numa_migration_crashes.patch
|
||||
# Currently empty
|
||||
|
||||
#############################################
|
||||
#
|
||||
@ -758,17 +760,17 @@ BuildRequires: libpng-devel
|
||||
BuildRequires: zlib-devel
|
||||
%else
|
||||
# Version in src/java.desktop/share/legal/freetype.md
|
||||
Provides: bundled(freetype) = 2.13.2
|
||||
Provides: bundled(freetype) = 2.13.3
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
||||
Provides: bundled(giflib) = 5.2.2
|
||||
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
||||
Provides: bundled(harfbuzz) = 8.2.2
|
||||
Provides: bundled(harfbuzz) = 10.4.0
|
||||
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
||||
Provides: bundled(lcms2) = 2.16.0
|
||||
Provides: bundled(lcms2) = 2.17.0
|
||||
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
||||
Provides: bundled(libjpeg) = 6b
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
||||
Provides: bundled(libpng) = 1.6.43
|
||||
Provides: bundled(libpng) = 1.6.47
|
||||
# Version in src/java.base/share/native/libzip/zlib/zlib.h
|
||||
Provides: bundled(zlib) = 1.3.1
|
||||
# We link statically against libstdc++ to increase portability
|
||||
@ -988,8 +990,6 @@ sh %{SOURCE12} %{top_level_dir_name}
|
||||
pushd %{top_level_dir_name}
|
||||
# Add crypto policy and FIPS support
|
||||
%patch -P1001 -p1
|
||||
# Add early JDK-8351500
|
||||
%patch -P2001 -p1
|
||||
popd # openjdk
|
||||
|
||||
|
||||
@ -1939,6 +1939,24 @@ done
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jul 08 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.1-0.1.ea
|
||||
- Update to jdk-21.0.8+1 (EA)
|
||||
- Update release notes to 21.0.8+1
|
||||
- Bump freetype version to 2.13.3 following JDK-8348596
|
||||
- Bump harfbuzz version to 10.4.0 following JDK-8348597
|
||||
- Bump lcms2 version to 2.17.0 following JDK-8348110
|
||||
- Bump libpng version to 1.6.47 following JDK-8348598
|
||||
- Switch to EA mode
|
||||
- Drop JDK-8351500 local patch which is now available in 21.0.8+1 upstream
|
||||
|
||||
* Fri Jul 04 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-3
|
||||
- Move riscv64 addition to ExclusiveArch to devkit_arches on RHEL
|
||||
- Related: OPENJDK-3850
|
||||
|
||||
* Tue May 20 2025 Kashyap Chamarthy <kchamart@redhat.com> - 1:21.0.7.0.6-3
|
||||
- Enable riscv64 arch; thanks: Songsong Zhang <U2FsdGVkX1@gmail.com>
|
||||
- Resolves: OPENJDK-3850
|
||||
|
||||
* Thu May 08 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-2
|
||||
- Add local version of JDK-8351500 for early interim release before 21.0.8
|
||||
- Resolves: OPENJDK-3679
|
||||
|
||||
@ -2571,6 +2571,7 @@ require "copy_jdk_configs.lua"
|
||||
- Bump libpng version to 1.6.47 following JDK-8348598
|
||||
- Switch to EA mode
|
||||
- Drop JDK-8351500 local patch which is now available in 21.0.8+1 upstream
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Related: RHEL-101799
|
||||
|
||||
* Thu May 08 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user