!128 Split patches for riscv64
From: @DingliZhang Reviewed-by: @kuenking111 Signed-off-by: @kuenking111
This commit is contained in:
commit
f917b0e4e6
@ -698,7 +698,9 @@ exit 0
|
|||||||
%{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1.gz
|
%{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1.gz
|
||||||
%{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1.gz
|
%{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1.gz
|
||||||
%{_mandir}/man1/jfr-%{uniquesuffix -- %{?1}}.1.gz
|
%{_mandir}/man1/jfr-%{uniquesuffix -- %{?1}}.1.gz
|
||||||
|
%ifarch %{linux_x64_aarch64}
|
||||||
%{_mandir}/man1/jaotc-%{uniquesuffix -- %{?1}}.1.gz
|
%{_mandir}/man1/jaotc-%{uniquesuffix -- %{?1}}.1.gz
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{with_systemtap}
|
%if %{with_systemtap}
|
||||||
%dir %{tapsetroot}
|
%dir %{tapsetroot}
|
||||||
@ -912,7 +914,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
|
|||||||
|
|
||||||
Name: java-%{javaver}-%{origin}
|
Name: java-%{javaver}-%{origin}
|
||||||
Version: %{newjavaver}.%{buildver}
|
Version: %{newjavaver}.%{buildver}
|
||||||
Release: 3
|
Release: 4
|
||||||
|
|
||||||
# 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
|
||||||
@ -1286,7 +1288,7 @@ fi
|
|||||||
|
|
||||||
# OpenJDK patches
|
# OpenJDK patches
|
||||||
|
|
||||||
%ifnarch loongarch64
|
%ifnarch loongarch64 riscv64
|
||||||
pushd %{top_level_dir_name}
|
pushd %{top_level_dir_name}
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
@ -1314,7 +1316,6 @@ pushd %{top_level_dir_name}
|
|||||||
%patch41 -p1
|
%patch41 -p1
|
||||||
%patch42 -p1
|
%patch42 -p1
|
||||||
%patch43 -p1
|
%patch43 -p1
|
||||||
%ifnarch riscv64
|
|
||||||
%patch44 -p1
|
%patch44 -p1
|
||||||
%patch45 -p1
|
%patch45 -p1
|
||||||
%patch46 -p1
|
%patch46 -p1
|
||||||
@ -1328,7 +1329,6 @@ pushd %{top_level_dir_name}
|
|||||||
%patch54 -p1
|
%patch54 -p1
|
||||||
%patch55 -p1
|
%patch55 -p1
|
||||||
%patch56 -p1
|
%patch56 -p1
|
||||||
%endif
|
|
||||||
%patch57 -p1
|
%patch57 -p1
|
||||||
%patch58 -p1
|
%patch58 -p1
|
||||||
%patch59 -p1
|
%patch59 -p1
|
||||||
@ -1353,6 +1353,48 @@ pushd %{top_level_dir_name}
|
|||||||
popd # openjdk
|
popd # openjdk
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%ifarch riscv64
|
||||||
|
pushd %{top_level_dir_name}
|
||||||
|
%patch1 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
%patch6 -p1
|
||||||
|
%patch7 -p1
|
||||||
|
%patch8 -p1
|
||||||
|
%patch9 -p1
|
||||||
|
%patch10 -p1
|
||||||
|
%patch11 -p1
|
||||||
|
%patch12 -p1
|
||||||
|
%patch13 -p1
|
||||||
|
%patch14 -p1
|
||||||
|
%patch16 -p1
|
||||||
|
%patch18 -p1
|
||||||
|
%patch19 -p1
|
||||||
|
%patch22 -p1
|
||||||
|
%patch23 -p1
|
||||||
|
%patch26 -p1
|
||||||
|
%patch28 -p1
|
||||||
|
%patch29 -p1
|
||||||
|
%patch30 -p1
|
||||||
|
%patch31 -p1
|
||||||
|
%patch32 -p1
|
||||||
|
%patch36 -p1
|
||||||
|
%patch41 -p1
|
||||||
|
%patch42 -p1
|
||||||
|
%patch43 -p1
|
||||||
|
%patch57 -p1
|
||||||
|
%patch58 -p1
|
||||||
|
%patch59 -p1
|
||||||
|
%patch60 -p1
|
||||||
|
%patch61 -p1
|
||||||
|
%patch62 -p1
|
||||||
|
%patch63 -p1
|
||||||
|
%patch64 -p1
|
||||||
|
%patch65 -p1
|
||||||
|
%patch66 -p1
|
||||||
|
%patch68 -p1
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
%ifarch loongarch64
|
%ifarch loongarch64
|
||||||
pushd %{top_level_dir_name}
|
pushd %{top_level_dir_name}
|
||||||
%patch2000 -p1
|
%patch2000 -p1
|
||||||
@ -1919,6 +1961,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 3 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:17.0.13.11-4
|
||||||
|
- Split patches for riscv64
|
||||||
|
- Increase the architecture isolation of jaotc
|
||||||
|
|
||||||
* Fri Nov 29 2024 kuenking111 <wangkun49@huawei.com.cn> - 1:17.0.13.11-3
|
* Fri Nov 29 2024 kuenking111 <wangkun49@huawei.com.cn> - 1:17.0.13.11-3
|
||||||
- add Add-jbolt-feature.patch
|
- add Add-jbolt-feature.patch
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user