Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 927145 - dev-java/openjdk-17.0.10_p7 Applying java17-riscv64.patch fails
Summary: dev-java/openjdk-17.0.10_p7 Applying java17-riscv64.patch fails
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: riscv Linux
: Normal normal
Assignee: Java team
URL:
Whiteboard:
Keywords: PullRequest
Depends on:
Blocks:
 
Reported: 2024-03-16 20:43 UTC by Andrew Cameron
Modified: 2024-04-11 14:41 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Build Log (build.log,58.88 KB, text/x-log)
2024-03-16 20:43 UTC, Andrew Cameron
Details
pqv log (pqv,403 bytes, text/plain)
2024-03-16 20:43 UTC, Andrew Cameron
Details
Environment (environment,160.54 KB, text/plain)
2024-03-16 20:44 UTC, Andrew Cameron
Details
Info log (info,8.53 KB, text/plain)
2024-03-16 20:44 UTC, Andrew Cameron
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Andrew Cameron 2024-03-16 20:43:09 UTC
Created attachment 887752 [details]
Build Log

* Using: openjdk-17
>>> Unpacking source...
>>> Unpacking openjdk-17.0.10_p7.tar.gz to /var/tmp/portage/dev-java/openjdk-17.0.10_p7/work
>>> Unpacking openjdk-bootstrap-17.0.3_p7-riscv.tar.xz to /var/tmp/portage/dev-java/openjdk-17.0.10_p7/work
>>> Unpacking java17-riscv64.patch to /var/tmp/portage/dev-java/openjdk-17.0.10_p7/work
unpack java17-riscv64.patch: file format not recognized. Ignoring.
>>> Source unpacked in /var/tmp/portage/dev-java/openjdk-17.0.10_p7/work
>>> Preparing source in /var/tmp/portage/dev-java/openjdk-17.0.10_p7/work/jdk17u-jdk-17.0.10-ga ...
 * Applying java17-riscv64.patch ...
patching file make/autoconf/jvm-features.m4
Hunk #1 FAILED at 308.
Hunk #2 FAILED at 358.
2 out of 2 hunks FAILED -- saving rejects to file make/autoconf/jvm-features.m4.rej
patching file make/autoconf/libraries.m4
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 146 (offset -2 lines).
1 out of 2 hunks FAILED -- saving rejects to file make/autoconf/libraries.m4.rej
patching file make/autoconf/platform.m4
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 561.
Hunk #3 FAILED at 571.
3 out of 3 hunks FAILED -- saving rejects to file make/autoconf/platform.m4.rej
patching file make/hotspot/gensrc/GensrcAdlc.gmk
Hunk #1 FAILED at 1.
Hunk #2 succeeded at 156 (offset 7 lines).
1 out of 2 hunks FAILED -- saving rejects to file make/hotspot/gensrc/GensrcAdlc.gmk.rej
patching file src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
Hunk #2 succeeded at 1577 (offset -13 lines).
patching file src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
Hunk #2 succeeded at 1413 (offset -4 lines).
patching file src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.cpp
Hunk #2 succeeded at 1547 (offset -7 lines).
The next patch would create the file src/hotspot/cpu/riscv/abstractInterpreter_riscv.cpp,
which already exists!  Applying it anyway.
patching file src/hotspot/cpu/riscv/abstractInterpreter_riscv.cpp
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file src/hotspot/cpu/riscv/abstractInterpreter_riscv.cpp.rej
The next patch would create the file src/hotspot/cpu/riscv/assembler_riscv.cpp,
which already exists!  Applying it anyway.
Comment 1 Andrew Cameron 2024-03-16 20:43:47 UTC
Created attachment 887753 [details]
pqv log
Comment 2 Andrew Cameron 2024-03-16 20:44:08 UTC
Created attachment 887754 [details]
Environment
Comment 3 Andrew Cameron 2024-03-16 20:44:32 UTC
Created attachment 887755 [details]
Info log
Comment 4 Yixun Lan archtester gentoo-dev 2024-04-11 06:26:46 UTC
according to this[1], jdk17 gain risc-v support officially starting at 17.0.9+4, so we probably should drop this patch.. also see [2] for more info

[1] https://wiki.riseproject.dev/display/HOME/LR_00_005%3A+Backport+RISC-V+support+to+jdk17u
[2] https://github.com/openjdk/jdk17u-dev/pull/1427
Comment 5 Larry the Git Cow gentoo-dev 2024-04-11 14:41:37 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e62eb64b67e61efb6bfe3a6a31e801a4dc14a4f

commit 7e62eb64b67e61efb6bfe3a6a31e801a4dc14a4f
Author:     Yixun Lan <dlan@gentoo.org>
AuthorDate: 2024-04-11 07:50:53 +0000
Commit:     Arthur Zamarin <arthurzam@gentoo.org>
CommitDate: 2024-04-11 14:41:24 +0000

    dev-java/openjdk: drop riscv specific patch
    
    According to [1], jdk17 gain risc-v support officially starting at 17.0.9+4,
    so the riscv specific patch is no longer needed.. also see [2] for more info
    
    I've built & tested on Milkv Poineer machine (lp64d systemd profile)
    
    [1] https://wiki.riseproject.dev/display/HOME/LR_00_005%3A+Backport+RISC-V+support+to+jdk17u
    [2] https://github.com/openjdk/jdk17u-dev/pull/1427
    
    Closes: https://bugs.gentoo.org/927145
    Signed-off-by: Yixun Lan <dlan@gentoo.org>
    Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

 dev-java/openjdk/Manifest                  | 1 -
 dev-java/openjdk/openjdk-17.0.10_p7.ebuild | 4 ----
 2 files changed, 5 deletions(-)