commit: 7e62eb64b67e61efb6bfe3a6a31e801a4dc14a4f Author: Yixun Lan <dlan <AT> gentoo <DOT> org> AuthorDate: Thu Apr 11 07:50:53 2024 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Thu Apr 11 14:41:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e62eb64
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 <AT> gentoo.org> Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-java/openjdk/Manifest | 1 - dev-java/openjdk/openjdk-17.0.10_p7.ebuild | 4 ---- 2 files changed, 5 deletions(-) diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index 2fe6b10adac3..10c371cdcac3 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1,4 +1,3 @@ -DIST java17-riscv64.patch 2253475 BLAKE2B a10a257f0b8bf590cdc011cf0c5af4854d49d6bbdf68dd74b2f996b70e0ecdd2b87bc4a02394f67ded5e664efb41f8dd03bb312fbfcffd84c289afdcbf7868de SHA512 06230b121e1f28189877025a4eab99e6d8cba176a17c88f073498fec6c73ab26130ce1500ea4f83235cc6abbc1742e47b227d60b5ff77465740048abdc52d165 DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b SHA512 c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45 DIST openjdk-11.0.22_p7.tar.gz 116235391 BLAKE2B 50b845b8f1e316da37e45c94a1890939659b554a314a1a455903e8cc58465cd69cd485548b6b42c445150187e37df5cf946d52bca754236a198f6aa10d7de37e SHA512 b88d0db9750d8201dfb4b027045de4023be766e42cca7a3ff5e0cb28db4c6da3f146a57819a6b81cb33e5837726986bcc3780ecf88bf525f445c2cd35a3993d8 DIST openjdk-17.0.10_p7.tar.gz 106398664 BLAKE2B 48cb2bc7d063da25a62834734ba4a887d26a27a8d84c535255df67419bf4f6d8b060c48ef37bd7324e14e957a141791380d4d9e42335a90f72dc34bc7b1d12fe SHA512 c2dfd66debdce488de044efcfc3f57cc9eb07ead2cfb7dd6e28e5748d48ec89f0c326a4c3f4a5c740019b8e5a02b858d93dd74a0c6626de445144b9840d3a426 diff --git a/dev-java/openjdk/openjdk-17.0.10_p7.ebuild b/dev-java/openjdk/openjdk-17.0.10_p7.ebuild index a54d350af017..f4c1df9b3d3f 100644 --- a/dev-java/openjdk/openjdk-17.0.10_p7.ebuild +++ b/dev-java/openjdk/openjdk-17.0.10_p7.ebuild @@ -46,10 +46,7 @@ SRC_URI=" $(bootstrap_uri x86 ${X86_XPAK}) $(bootstrap_uri riscv ${RISCV_XPAK}) ) - riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch ) " -# riscv patch origin: -# https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch LICENSE="GPL-2-with-classpath-exception" KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" @@ -163,7 +160,6 @@ pkg_setup() { } src_prepare() { - use riscv && eapply "${DISTDIR}"/java17-riscv64.patch default chmod +x configure || die }
