Merge branch 'openEuler-24.03-LTS-Next' of gitee.com:src-openeuler/openjdk-17 into Update-LoongArch
Signed-off-by: panxuefeng <panxuefeng@loongson.cn>
This commit is contained in:
commit
19d31032b1
@ -903,7 +903,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
|
|||||||
|
|
||||||
Name: java-%{javaver}-%{origin}
|
Name: java-%{javaver}-%{origin}
|
||||||
Version: %{newjavaver}.%{buildver}
|
Version: %{newjavaver}.%{buildver}
|
||||||
Release: 4
|
Release: 5
|
||||||
|
|
||||||
# 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
|
||||||
@ -1283,6 +1283,7 @@ 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
|
||||||
@ -1296,6 +1297,7 @@ pushd %{top_level_dir_name}
|
|||||||
%patch54 -p1
|
%patch54 -p1
|
||||||
%patch55 -p1
|
%patch55 -p1
|
||||||
%patch56 -p1
|
%patch56 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
popd # openjdk
|
popd # openjdk
|
||||||
%endif
|
%endif
|
||||||
@ -1863,9 +1865,12 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Oct 31 2024 Pan Xuefeng <panxuefeng@loongson.cn> - 1:17.0.12.7-4
|
* Thu Oct 31 2024 Pan Xuefeng <panxuefeng@loongson.cn> - 1:17.0.12.7-5
|
||||||
- update LoongArch64 port to 17.0.12.7
|
- update LoongArch64 port to 17.0.12.7
|
||||||
|
|
||||||
|
* Mon Sep 23 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:17.0.12.7-4
|
||||||
|
- Remove the KAE patch for riscv64 to fix build errors
|
||||||
|
|
||||||
* Fri Aug 30 2024 neu-mob <liuyulong35@huawei.com> - 1:17.0.12.7-3
|
* Fri Aug 30 2024 neu-mob <liuyulong35@huawei.com> - 1:17.0.12.7-3
|
||||||
- Add some features: JBooster/KAE zip
|
- Add some features: JBooster/KAE zip
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user