From 151fd15f94b358fce92c6af18b151330220663c2 Mon Sep 17 00:00:00 2001
From: Dingli Zhang <dingli@iscas.ac.cn>
Date: Thu, 19 Jun 2025 08:33:08 +0000
Subject: [PATCH] Split patches for riscv64 to fix build in prep stage

---
 openjdk-1.8.0.spec | 328 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 324 insertions(+), 4 deletions(-)

diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec
index a460262..70ff896 100644
--- a/openjdk-1.8.0.spec
+++ b/openjdk-1.8.0.spec
@@ -953,7 +953,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}.%{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
 # also included the epoch in their virtual provides. This created a
@@ -1734,7 +1734,7 @@ ln -s %{top_level_dir_name} jdk8
 
 pushd %{top_level_dir_name}
 # OpenJDK patches
-%ifnarch loongarch64 ppc64le sw_64
+%ifnarch loongarch64 ppc64le sw_64 riscv64
 
 %patch8  -p1
 %patch10 -p1
@@ -2035,9 +2035,7 @@ pushd %{top_level_dir_name}
 %patch435 -p1
 %patch436 -p1
 %patch437 -p1
-%ifnarch riscv64
 %patch438 -p1
-%endif
 %patch439 -p1
 %patch440 -p1
 %patch441 -p1
@@ -2083,6 +2081,325 @@ pushd %{top_level_dir_name}
 %endif
 
 %ifarch riscv64
+%patch8  -p1
+%patch10 -p1
+%patch18 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch30 -p1
+%patch31 -p1
+%patch33 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch41 -p1
+%patch47 -p1
+%patch50 -p1
+%patch51 -p1
+%patch57 -p1
+%patch58 -p1
+%patch62 -p1
+%patch63 -p1
+%patch67 -p1
+%patch70 -p1
+%patch83 -p1
+%patch85 -p1
+%patch86 -p1
+%patch87 -p1
+%patch88 -p1
+%patch89 -p1
+%patch90 -p1
+%patch91 -p1
+%patch92 -p1
+%patch94 -p1
+%patch95 -p1
+%patch96 -p1
+%patch97 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch109 -p1
+%patch112 -p1
+%patch113 -p1
+%patch114 -p1
+%patch115 -p1
+%patch118 -p1
+%patch121 -p1
+%patch122 -p1
+%patch125 -p1
+%patch127 -p1
+%patch133 -p1
+%patch134 -p1
+%patch138 -p1
+%patch139 -p1
+%patch140 -p1
+%patch141 -p1
+%patch142 -p1
+%patch144 -p1
+%patch147 -p1
+%patch148 -p1
+%patch149 -p1
+%patch151 -p1
+%patch153 -p1
+%patch154 -p1
+%patch155 -p1
+%patch157 -p1
+%patch158 -p1
+%patch159 -p1
+%patch162 -p1
+%patch163 -p1
+%patch164 -p1
+%patch166 -p1
+%patch167 -p1
+%patch168 -p1
+%patch169 -p1
+%patch170 -p1
+%patch171 -p1
+%patch172 -p1
+%patch173 -p1
+%patch174 -p1
+%patch175 -p1
+%patch176 -p1
+%patch177 -p1
+%patch178 -p1
+%patch179 -p1
+%patch180 -p1
+%patch183 -p1
+%patch184 -p1
+%patch185 -p1
+%patch186 -p1
+%patch188 -p1
+%patch192 -p1
+%patch194 -p1
+%patch195 -p1
+%patch196 -p1
+%patch197 -p1
+%patch198 -p1
+%patch200 -p1
+%patch201 -p1
+%patch202 -p1
+%patch203 -p1
+%patch204 -p1
+%patch205 -p1
+%patch207 -p1
+%patch208 -p1
+%patch209 -p1
+%patch210 -p1
+%patch212 -p1
+%patch214 -p1
+%patch215 -p1
+%patch216 -p1
+%patch218 -p1
+%patch219 -p1
+%patch220 -p1
+%patch222 -p1
+%patch223 -p1
+%patch224 -p1
+%patch225 -p1
+%patch226 -p1
+%patch228 -p1
+%patch229 -p1
+%patch230 -p1
+%patch233 -p1
+%patch235 -p1
+%patch236 -p1
+%patch237 -p1
+%patch238 -p1
+%patch239 -p1
+%patch240 -p1
+%patch241 -p1
+%patch243 -p1
+%patch244 -p1
+%patch245 -p1
+%patch246 -p1
+%patch249 -p1
+%patch250 -p1
+%patch251 -p1
+%patch252 -p1
+%patch253 -p1
+%patch254 -p1
+%patch255 -p1
+%patch256 -p1
+%patch257 -p1
+%patch258 -p1
+%patch259 -p1
+%patch261 -p1
+%patch262 -p1
+%patch263 -p1
+%patch266 -p1
+%patch273 -p1
+%patch274 -p1
+%patch275 -p1
+%patch276 -p1
+%patch277 -p1
+%patch278 -p1
+%patch279 -p1
+%patch280 -p1
+%patch281 -p1
+%patch282 -p1
+%patch283 -p1
+%patch284 -p1
+%patch285 -p1
+%patch286 -p1
+%patch287 -p1
+%patch288 -p1
+%patch289 -p1
+%patch290 -p1
+%patch291 -p1
+%patch293 -p1
+%patch294 -p1
+%patch295 -p1
+%patch296 -p1
+%patch298 -p1
+%patch299 -p1
+%patch300 -p1
+%patch301 -p1
+%patch302 -p1
+%patch303 -p1
+%patch304 -p1
+%patch305 -p1
+%patch306 -p1
+%patch307 -p1
+%patch308 -p1
+%patch309 -p1
+%patch310 -p1
+%patch311 -p1
+%patch312 -p1
+%patch313 -p1
+%patch314 -p1
+%patch315 -p1
+%patch316 -p1
+%patch317 -p1
+%patch318 -p1
+%patch320 -p1
+%patch321 -p1
+%patch322 -p1
+%patch323 -p1
+%patch324 -p1
+%patch325 -p1
+%patch326 -p1
+%patch327 -p1
+%patch329 -p1
+%patch330 -p1
+%patch331 -p1
+%patch332 -p1
+%patch333 -p1
+%patch334 -p1
+%patch335 -p1
+%patch336 -p1
+%patch337 -p1
+%patch338 -p1
+%patch339 -p1
+%patch340 -p1
+%patch341 -p1
+%patch342 -p1
+%patch343 -p1
+%patch344 -p1
+%patch345 -p1
+%patch346 -p1
+%patch347 -p1
+%patch348 -p1
+%patch349 -p1
+%patch350 -p1
+%patch351 -p1
+%patch352 -p1
+%patch353 -p1
+%patch354 -p1
+%patch355 -p1
+%patch356 -p1
+%patch357 -p1
+%patch359 -p1
+%patch360 -p1
+%patch361 -p1
+%patch362 -p1
+%patch363 -p1
+%patch364 -p1
+%patch365 -p1
+%patch366 -p1
+%patch367 -p1
+%patch369 -p1
+%patch370 -p1
+%patch371 -p1
+%patch372 -p1
+%patch373 -p1
+%patch374 -p1
+%patch375 -p1
+%patch377 -p1
+%patch379 -p1
+%patch384 -p1
+%patch385 -p1
+%patch386 -p1
+%patch387 -p1
+%patch389 -p1
+%patch390 -p1
+%patch391 -p1
+%patch392 -p1
+%patch393 -p1
+%patch394 -p1
+%patch395 -p1
+%patch396 -p1
+%patch397 -p1
+%patch398 -p1
+%patch399 -p1
+%patch400 -p1
+%patch401 -p1
+%patch402 -p1
+%patch403 -p1
+%patch404 -p1
+%patch405 -p1
+%patch406 -p1
+%patch408 -p1
+%patch409 -p1
+%patch410 -p1
+%patch411 -p1
+%patch412 -p1
+%patch413 -p1
+%patch414 -p1
+%patch415 -p1
+%patch416 -p1
+%patch417 -p1
+%patch418 -p1
+%patch421 -p1
+%patch422 -p1
+%patch423 -p1
+%patch424 -p1
+%patch425 -p1
+%patch426 -p1
+%patch427 -p1
+%patch428 -p1
+%patch429 -p1
+%patch430 -p1
+%patch431 -p1
+%patch432 -p1
+%patch433 -p1
+%patch434 -p1
+%patch435 -p1
+%patch436 -p1
+%patch437 -p1
+%patch439 -p1
+%patch440 -p1
+%patch441 -p1
+%patch442 -p1
+%patch443 -p1
+%patch445 -p1
+%patch446 -p1
+%patch447 -p1
+%patch448 -p1
+%patch449 -p1
+%patch450 -p1
+%patch451 -p1
+%patch452 -p1
+%patch453 -p1
+%patch454 -p1
+%patch455 -p1
+%patch456 -p1
+%patch457 -p1
+%patch458 -p1
+%patch459 -p1
 %patch2000 -p1
 %endif
 popd
@@ -2733,6 +3050,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
 %endif
 
 %changelog
+* Thu Jun 19 2025 Dingli Zhang <dingli@iscas.ac.cn> -1:1.8.0.452.b09-6
+- Split patches for riscv64 to fix build in prep stage
+
 * Mon Jun 16 2025 huangjie <huangjie150@huawei.com> -1:1.8.0.452.b09-5
 - add set-JProfilecache-feature-experimental.patch
 
-- 
Gitee