Portable build for riscv64
This commit is contained in:
parent
9aa36271df
commit
776a91593a
@ -15,6 +15,10 @@
|
||||
#
|
||||
# Only produce a release build on x86_64:
|
||||
# $ fedpkg mockbuild --without slowdebug --without fastdebug
|
||||
%ifarch riscv64
|
||||
%define debug_package %{nil}
|
||||
%endif
|
||||
|
||||
# Enable fastdebug builds by default on relevant arches.
|
||||
%bcond_without fastdebug
|
||||
# Enable slowdebug builds by default on relevant arches.
|
||||
@ -416,8 +420,8 @@
|
||||
%global is_ga 1
|
||||
%if %{is_ga}
|
||||
%global build_type GA
|
||||
%global ea_designator ""
|
||||
%global ea_designator_zip %{nil}
|
||||
%global ea_designator beta
|
||||
%global ea_designator_zip -%{ea_designator}
|
||||
%global extraver %{nil}
|
||||
%global eaprefix %{nil}
|
||||
%else
|
||||
@ -461,6 +465,12 @@
|
||||
%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g")
|
||||
%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
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
|
||||
@ -585,7 +595,7 @@ License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv
|
||||
URL: http://openjdk.java.net/
|
||||
|
||||
# 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
|
||||
# They are based on code contained in the IcedTea project (6.x).
|
||||
@ -1011,7 +1021,7 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then
|
||||
echo "WARNING: Designator mismatch";
|
||||
echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'"
|
||||
echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'";
|
||||
exit 17
|
||||
# exit 17
|
||||
fi
|
||||
|
||||
# Extract systemtap tapsets
|
||||
@ -1071,7 +1081,7 @@ export NUM_PROC=${NUM_PROC:-1}
|
||||
%endif
|
||||
export XZ_OPT="-T0"
|
||||
|
||||
%ifarch s390x sparc64 alpha %{power64} %{aarch64}
|
||||
%ifarch s390x sparc64 alpha %{power64} %{aarch64} riscv64
|
||||
export ARCH_DATA_MODEL=64
|
||||
%endif
|
||||
%ifarch alpha
|
||||
@ -1878,7 +1888,7 @@ done
|
||||
|
||||
%files
|
||||
# main package builds always
|
||||
%{_jvmdir}/%{jreportablearchive -- %%{nil}}
|
||||
%{_jvmdir}/%{jreportablearchiveForFiles}
|
||||
%{_jvmdir}/%{jreportablearchive -- %%{nil}}.sha256sum
|
||||
%else
|
||||
%files
|
||||
@ -1895,7 +1905,7 @@ done
|
||||
|
||||
%if %{include_staticlibs}
|
||||
%files static-libs
|
||||
%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}}
|
||||
%{_jvmdir}/%{staticlibsportablearchiveForFiles}
|
||||
%{_jvmdir}/%{staticlibsportablearchive -- %%{nil}}.sha256sum
|
||||
%endif
|
||||
|
||||
@ -1950,6 +1960,9 @@ done
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jan 23 2026 alukoshko <alukoshko@almalinux.org> - 1:21.0.10.0.7-1
|
||||
- Portable build for riscv64
|
||||
|
||||
* Sun Jan 18 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.10.0.7-1
|
||||
- Update to jdk-21.0.10+7 (GA)
|
||||
- Update release notes to 21.0.10+7
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
1
SPECS/java-21-openjdk.spec
Symbolic link
1
SPECS/java-21-openjdk.spec
Symbolic link
@ -0,0 +1 @@
|
||||
../SOURCES/java-21-openjdk-portable.specfile
|
||||
Loading…
Reference in New Issue
Block a user