From 29becfe1c33955c76ba83498f41e54581c5b1583 Mon Sep 17 00:00:00 2001
From: Dingli Zhang <dingli@iscas.ac.cn>
Date: Wed, 4 Dec 2024 05:18:48 +0000
Subject: [PATCH] Split patches for riscv64

---
 openjdk-17.spec | 58 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/openjdk-17.spec b/openjdk-17.spec
index f168874..d3d8a2b 100644
--- a/openjdk-17.spec
+++ b/openjdk-17.spec
@@ -698,7 +698,9 @@ exit 0
 %{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1.gz
 %{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1.gz
 %{_mandir}/man1/jfr-%{uniquesuffix -- %{?1}}.1.gz
+%ifarch %{linux_x64_aarch64}
 %{_mandir}/man1/jaotc-%{uniquesuffix -- %{?1}}.1.gz
+%endif
 
 %if %{with_systemtap}
 %dir %{tapsetroot}
@@ -912,7 +914,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: 5
+Release: 6
 
 # 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
@@ -1286,7 +1288,7 @@ fi
 
 # OpenJDK patches
 
-%ifnarch loongarch64
+%ifnarch loongarch64  riscv64
 pushd %{top_level_dir_name}
 %patch 1 -p1
 %patch 3 -p1
@@ -1314,7 +1316,6 @@ pushd %{top_level_dir_name}
 %patch 41 -p1
 %patch 42 -p1
 %patch 43 -p1
-%ifnarch riscv64
 %patch 44 -p1
 %patch 45 -p1
 %patch 46 -p1
@@ -1328,7 +1329,6 @@ pushd %{top_level_dir_name}
 %patch 54 -p1
 %patch 55 -p1
 %patch 56 -p1
-%endif
 %patch 57 -p1
 %patch 58 -p1
 %patch 59 -p1
@@ -1339,9 +1339,7 @@ pushd %{top_level_dir_name}
 %patch 64 -p1
 %patch 65 -p1
 %patch 66 -p1
-%ifnarch riscv64
 %patch 67 -p1
-%endif
 %patch 68 -p1
 %patch 69 -p1
 %patch 70 -p1
@@ -1355,6 +1353,48 @@ pushd %{top_level_dir_name}
 popd # openjdk
 %endif
 
+%ifarch riscv64
+pushd %{top_level_dir_name}
+%patch 1 -p1
+%patch 3 -p1
+%patch 6 -p1
+%patch 7 -p1
+%patch 8 -p1
+%patch 9 -p1
+%patch 10 -p1
+%patch 11 -p1
+%patch 12 -p1
+%patch 13 -p1
+%patch 14 -p1
+%patch 16 -p1
+%patch 18 -p1
+%patch 19 -p1
+%patch 22 -p1
+%patch 23 -p1
+%patch 26 -p1
+%patch 28 -p1
+%patch 29 -p1
+%patch 30 -p1
+%patch 31 -p1
+%patch 32 -p1
+%patch 36 -p1
+%patch 41 -p1
+%patch 42 -p1
+%patch 43 -p1
+%patch 57 -p1
+%patch 58 -p1
+%patch 59 -p1
+%patch 60 -p1
+%patch 61 -p1
+%patch 62 -p1
+%patch 63 -p1
+%patch 64 -p1
+%patch 65 -p1
+%patch 66 -p1
+%patch 68 -p1
+popd
+%endif
+
 %ifarch loongarch64
 pushd %{top_level_dir_name}
 %patch 2000 -p1
@@ -1921,8 +1961,12 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
 
 
 %changelog
+* Wed Dec 4 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:17.0.13.11-6
+- Split patches for riscv64
+- Increase the architecture isolation of jaotc
+
 * Tue Dec 03 2024 shenzhongwei <shenzhongwei@kylinos.cn> - 1:17.0.13.11-5
-- fix: %patchN is deprecated (51 usages found), use %patch N (or %patch -P N) 
+- fix: %patchN is deprecated (51 usages found), use %patch N (or %patch -P N)
 
 * Fri Nov 29 2024 kuenking111 <wangkun49@huawei.com.cn> - 1:17.0.13.11-4
 - add Add-jbolt-feature.patch
-- 
Gitee