rpms/java-21-openjdk
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add fixes from CentOS ISA SIG

Browse Source
This commit is contained in:
Andrew Lukoshko 2025-08-13 15:27:06 +02:00
parent 7148940163
commit fc88fd872a
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
SOURCES/java-21-openjdk-portable.specfile
View File

@ -15,6 +15,11 @@
# #
# Only produce a release build on x86_64: # Only produce a release build on x86_64:
# $ fedpkg mockbuild --without slowdebug --without fastdebug # $ fedpkg mockbuild --without slowdebug --without fastdebug
%ifarch riscv64
%define debug_package %{nil}
%endif
# Enable fastdebug builds by default on relevant arches. # Enable fastdebug builds by default on relevant arches.
%bcond_without fastdebug %bcond_without fastdebug
# Enable slowdebug builds by default on relevant arches. # Enable slowdebug builds by default on relevant arches.
@ -416,8 +421,8 @@
%global is_ga 1 %global is_ga 1
%if %{is_ga} %if %{is_ga}
%global build_type GA %global build_type GA
%global ea_designator "" %global ea_designator beta
%global ea_designator_zip %{nil} %global ea_designator_zip -%{ea_designator}
%global extraver %{nil} %global extraver %{nil}
%global eaprefix %{nil} %global eaprefix %{nil}
%else %else
@ -461,6 +466,12 @@
%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g") %define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g")
%define miscportablearchive() %{miscportablename}.tar.xz %define miscportablearchive() %{miscportablename}.tar.xz
# RPM 4.19 no longer accept our double percentaged %%{nil} passed to %%{1}
# so we have to pass in "" but evaluate it, otherwise files record will include it
%define jreportablearchiveForFiles() %(echo %{jreportablearchive -- ""})
%define jdkportablearchiveForFiles() %(echo %{jdkportablearchive -- ""})
%define staticlibsportablearchiveForFiles() %(echo %{staticlibsportablearchive -- ""})
################################################################# #################################################################
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349 # fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14 # https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
@ -585,7 +596,7 @@ License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv
URL: http://openjdk.java.net/ URL: http://openjdk.java.net/
# The source tarball, generated using generate_source_tarball.sh # The source tarball, generated using generate_source_tarball.sh
Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_designator_zip}.tar.xz Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}.tar.xz
# Use 'icedtea_sync.sh' to update the following # Use 'icedtea_sync.sh' to update the following
# They are based on code contained in the IcedTea project (6.x). # They are based on code contained in the IcedTea project (6.x).
@ -1010,7 +1021,7 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then
echo "WARNING: Designator mismatch"; echo "WARNING: Designator mismatch";
echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'" echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'"
echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'"; echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'";
exit 17 # exit 17
fi fi
# Extract systemtap tapsets # Extract systemtap tapsets
@ -1062,7 +1073,7 @@ export NUM_PROC=${NUM_PROC:-1}
%endif %endif
export XZ_OPT="-T0" export XZ_OPT="-T0"
%ifarch s390x sparc64 alpha %{power64} %{aarch64} %ifarch s390x sparc64 alpha %{power64} %{aarch64} riscv64
export ARCH_DATA_MODEL=64 export ARCH_DATA_MODEL=64
%endif %endif
%ifarch alpha %ifarch alpha
@ -1873,8 +1884,8 @@ done
%files %files
# main package builds always # main package builds always
%{_jvmdir}/%{jreportablearchive -- %%{nil}} %{_jvmdir}/%{jreportablearchiveForFiles}
%{_jvmdir}/%{jreportablearchive -- %%{nil}}.sha256sum %{_jvmdir}/%{jreportablearchiveForFiles}.sha256sum
%else %else
%files %files
# placeholder # placeholder
@ -1883,15 +1894,15 @@ done
%if %{include_normal_build} %if %{include_normal_build}
%files devel %files devel
%{_jvmdir}/%{jdkportablearchive -- %%{nil}} %{_jvmdir}/%{jdkportablearchiveForFiles}
%{_jvmdir}/%{jdkportablearchive -- .debuginfo} %{_jvmdir}/%{jdkportablearchive -- .debuginfo}
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}.sha256sum %{_jvmdir}/%{jdkportablearchiveForFiles}.sha256sum
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum %{_jvmdir}/%{jdkportablearchive -- .debuginfo}.sha256sum
%if %{include_staticlibs} %if %{include_staticlibs}
%files static-libs %files static-libs
%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}} %{_jvmdir}/%{staticlibsportablearchiveForFiles}
%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}}.sha256sum %{_jvmdir}/%{staticlibsportablearchiveForFiles}.sha256sum
%endif %endif
%files unstripped %files unstripped