| 1 |
commit: b65e502dadc2ff542f449aaea8c5942db791cf2e |
| 2 |
Author: Han Gao <rabenda.cn <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Apr 30 14:02:40 2022 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 1 20:46:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65e502d |
| 7 |
|
| 8 |
dev-java/openjdk: keyword 11.0.14_p9-r1 for ~riscv |
| 9 |
|
| 10 |
- Patch for riscv given by Han Gao <rabenda.cn <AT> gmail.com> |
| 11 |
- Taken from opensuse RISC-V |
| 12 |
- Tarball built on gyakovlev's riscv machine, using opensuse's |
| 13 |
openjdk-11 tarball as bootstrap jdk |
| 14 |
|
| 15 |
Bug: https://bugs.gentoo.org/782916 |
| 16 |
Co-authored-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
| 17 |
Signed-off-by: Han Gao <rabenda.cn <AT> gmail.com> |
| 18 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
| 19 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 20 |
|
| 21 |
dev-java/openjdk/Manifest | 2 ++ |
| 22 |
dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild | 8 ++++++-- |
| 23 |
2 files changed, 8 insertions(+), 2 deletions(-) |
| 24 |
|
| 25 |
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest |
| 26 |
index 07690da8db6a..311ec5d8e713 100644 |
| 27 |
--- a/dev-java/openjdk/Manifest |
| 28 |
+++ b/dev-java/openjdk/Manifest |
| 29 |
@@ -1,4 +1,5 @@ |
| 30 |
DIST openjdk-11.0.13_p8.tar.gz 122738754 BLAKE2B 5a60bf4245bc1e3591f4ebdf83a441f95a97a50a72a774612e99792789cd81a9317471cdadf4541efbe9b1549c2738a3cd30d134d3ded8de6d58f8a67b2aebe6 SHA512 38bd1be54533e9eebe407e771b1ece86ead755d1f3f0199e425aa4ad3e8fe511b0024986b7ffc59c571faa3dad510956e98ab1a48cb184c9cf5353bb7512cb06 |
| 31 |
+DIST openjdk-11.0.14-riscv.patch.xz 279088 BLAKE2B f67cf5707246b22285de8217b68fb806e3c18b7289cb81428c0fe83c5a4dcd60233be10aaca0853ffb00ac24fa60cae1b1d60ed300ad6bff8b07e881bddf8650 SHA512 32bac5f0c0f5df883de344718586bf798db6c8a5738058ea5d4902f5a0a3fc841c1893dec3379a74b9468c1c37af5c31a3e296476549972d3f1305401354060d |
| 32 |
DIST openjdk-11.0.14_p9.tar.gz 122803178 BLAKE2B 521d7829b34fa4f9a143c51d61c339c8c7455f12c4f04eda4fdd687dafa842f2a1b1adfe2e897fecdfa4e1c3ee484ec0e3aaf38ab9246f20cd24e7185db6ba25 SHA512 3285d13ba0fbbfd4f1a676b0f099b0742527ff556edfc3387913b59b64126bdfecd2697d7ac83634ed7160adf46edca3b5b2c33d94e9dca068752da5b9d70837 |
| 33 |
DIST openjdk-17.0.1_p12.tar.gz 104597561 BLAKE2B 9bae16c0c0b973017258076bf8597101538e7ef29cb16357b17b112ae1aa058b17d26f22057cf3d6638104dbd83f5c19b6bcd124f589fc100eae83f78dc1c269 SHA512 220d87a29e1a25b670d721c27069b601a48c833069cb252f81ee6de2ff65fef23fd76e689fc755940f7e457b2419ef93a15cbeca64db2a8798028729df876d25 |
| 34 |
DIST openjdk-17.0.2_p8.tar.gz 104741920 BLAKE2B 749b1699f1b4b2bb6ee1139ceb704ba3b3f3789770176e5f0dc4b1d5ce5c2887514fc3c256a64f2ad9bb017339c20ef10110f35b523ee1edcd62924e41f44f03 SHA512 8eeb8b56410178179cc95aa02b0bf827fac3fbf6242a905502a6594763be809a727e55e87866ac65be56c22d6f78ec0c483bdaab9411f07d4b160c49b06921fa |
| 35 |
@@ -14,6 +15,7 @@ DIST openjdk-aarch64-shenandoah-langtools-8.312_p07.tar.bz2 2403116 BLAKE2B 10c1 |
| 36 |
DIST openjdk-aarch64-shenandoah-nashorn-jdk8.312_p07.tar.bz2 2845057 BLAKE2B ff32686b27b767683ae0a670b2509291b6708d371b398cac854210132f555218b9189d3012cf9b45e0584f44425e09aefb8acbef95f1786787067f4d5275fdbe SHA512 71fad14ad6b7a75ee499bc0b3370e5beb22d5a7e32a02d54fc5dff1cf25ede51c3a8a04de6424947ddaa3b5d4a0d7f5a447ba073b62c5c86a49c0543cec3f374 |
| 37 |
DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e |
| 38 |
DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f |
| 39 |
+DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829fae70ad6c007f10bfeff79e29c85d6c75fb2f5ff8984fd2a2bd44ee6e07958dbbdaaed761c6839d375e1b5ba6cffc63b02ad9e2c9178310db SHA512 580dec81626553fe3e7afd0f6385a733ba80a0502cf0f9e8bdc973048887290c9ab6171267d61d8838c4ece4de58c9ca8b78540bd52b1757495a27175057ec64 |
| 40 |
DIST openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz 116557680 BLAKE2B d20e45a5a76e30ee60446993bf5dcf0fa10b8b668ebec637ea02b458a472c642f22740e18f28cbf9923ea4cceb17702115c038b13137442e5f0572477d37f12f SHA512 92e0343f493d094300911625a561f42c47402ca4cdbd2ac18414089e8ed8a50ca58f02ec1ef9a3dce017ab7af99a22ab465ddf732ab9e55728e2b146de56fba7 |
| 41 |
DIST openjdk-bootstrap-17.0.1_p12-x86.tar.xz 111479904 BLAKE2B 17d33f8ee81c2846f417d8e7cd1429eb611e916a6b375c76127179dc6afc55b0254248360c892ce37a178fd553934d952ec8955ff5d0613eb66678b8ecefe917 SHA512 094bcc960801e5fd7e1c966c8101c195ac7fa5e222d9c8e79ca64f8a3e6812613c17a0356211e7dd831325fa11af88cc22ed56c434d65504f18dd4f4ceaedfdf |
| 42 |
DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab078085f094bbcc65448458d98a0f521e3b754c5118b1b4f957cfa00c24e896c811c2a477822c469ffcfe0de1ad6a8d0b7db23b0b09ae3b459eaf8c4fc8 SHA512 e30acd6c64a0095f4203129ecf2cff4c6b4293bc017457465d3abb746d280a2f5d89028eed22f7f3d236890d047149c7aa257e3b49593d7a6ab4dd6b777a7c26 |
| 43 |
|
| 44 |
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild |
| 45 |
index 1e00ec30c2ed..fa243d77955b 100644 |
| 46 |
--- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild |
| 47 |
+++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild |
| 48 |
@@ -12,6 +12,7 @@ SLOT="${MY_PV%%[.+]*}" |
| 49 |
|
| 50 |
# variable name format: <UPPERCASE_KEYWORD>_XPAK |
| 51 |
PPC64_XPAK="11.0.13_p8" # big-endian bootstrap tarball |
| 52 |
+RISCV_XPAK="11.0.14_p9" # lp64d bootstrap tarball |
| 53 |
X86_XPAK="11.0.13_p8" |
| 54 |
|
| 55 |
# Usage: bootstrap_uri <keyword> <version> [extracond] |
| 56 |
@@ -35,12 +36,14 @@ SRC_URI=" |
| 57 |
-> ${P}.tar.gz |
| 58 |
!system-bootstrap? ( |
| 59 |
$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) |
| 60 |
+ $(bootstrap_uri riscv ${RISCV_XPAK}) |
| 61 |
$(bootstrap_uri x86 ${X86_XPAK}) |
| 62 |
) |
| 63 |
+ riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-11.0.14-riscv.patch.xz ) |
| 64 |
" |
| 65 |
|
| 66 |
LICENSE="GPL-2" |
| 67 |
-KEYWORDS="amd64 ~arm arm64 ppc64 x86" |
| 68 |
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" |
| 69 |
|
| 70 |
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap" |
| 71 |
|
| 72 |
@@ -146,6 +149,7 @@ pkg_setup() { |
| 73 |
} |
| 74 |
|
| 75 |
src_prepare() { |
| 76 |
+ use riscv && eapply "${WORKDIR}"/openjdk-11.0.14-riscv.patch |
| 77 |
default |
| 78 |
chmod +x configure || die |
| 79 |
} |
| 80 |
@@ -175,7 +179,6 @@ src_configure() { |
| 81 |
--with-freetype="${XPAK_BOOTSTRAP:-system}" |
| 82 |
--with-giflib="${XPAK_BOOTSTRAP:-system}" |
| 83 |
--with-harfbuzz="${XPAK_BOOTSTRAP:-system}" |
| 84 |
- --with-jvm-features=shenandoahgc |
| 85 |
--with-lcms="${XPAK_BOOTSTRAP:-system}" |
| 86 |
--with-libjpeg="${XPAK_BOOTSTRAP:-system}" |
| 87 |
--with-libpng="${XPAK_BOOTSTRAP:-system}" |
| 88 |
@@ -193,6 +196,7 @@ src_configure() { |
| 89 |
--enable-headless-only=$(usex headless-awt yes no) |
| 90 |
$(tc-is-clang && echo "--with-toolchain-type=clang") |
| 91 |
) |
| 92 |
+ ! use riscv && myconf+=( --with-jvm-features=shenandoahgc ) |
| 93 |
|
| 94 |
if use javafx; then |
| 95 |
# this is not useful for users, just for upstream developers |
Archives