From 75606cf65a072a5a8873a0f5cf7802686e764378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 2 Mar 2024 21:42:05 +0000 Subject: [PATCH] openjdk-17: reinstated jbootstrap as removing it breaks installation. --- dev-java/openjdk/Manifest | 2 +- dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index 61012a3..19cd2dd 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -97,7 +97,7 @@ EBUILD openjdk-13.0.4_p01.ebuild 7809 BLAKE2B a9f4c1ab2535cada4ef40d2ad846dc0f73 EBUILD openjdk-14.0.2_p01.ebuild 7809 BLAKE2B a9f4c1ab2535cada4ef40d2ad846dc0f73374be6dbed25c0435730fedace7e5fd669baf0da9d6fe07ff520e9780e0b416072ab19981ecfc6b3bc33b360a1aeb6 SHA512 90f91a8b23fd51fbcc0083f8a297b4904aed4d6508f2866b81b7c69f5dadb8f6d75e98afcc0b3b014ac9d68d845a3c5182f1042814e7acafecf87a3f27335086 EBUILD openjdk-15.0.0_p36.ebuild 7548 BLAKE2B eb9c422ad17ede9206a728efdd892f49fd305aa8a584ff8d8a00c7b1cf86fff9976c9b81023690e916cdf3c7e373f96061f28ab49324df9b63685b5de63bf5e0 SHA512 ba62cd8691c2561ebf1b1d1e597052f123ec21b88e2f36ad0c5ca707720ff4b0a30751cd871947d8d23c6febe2f3a297695227a1c28a9c5936317114c3a0fb56 EBUILD openjdk-16.0.0_p36.ebuild 7021 BLAKE2B 75858939c91bbb9e5b32a900752d8850fbf6aede50347fa1f82d1775dffe7614e601c6dbce172d470bb7ee074f031fa8a82c5b4094d3f7bae54113d2ef22198a SHA512 82c46f8f9bacad7f4d9144cf5cfef55a335aa6cb9c857042f5587ca2aefabf7ff4305416279f4bb6ec9827acfe595537e5dfe3f1ba327f02c94215f937447e9b -EBUILD openjdk-17.0.8.1_p1.ebuild 7887 BLAKE2B 40b0f1d5f5fbcdd7c85766bcdf018fc7d640c75095227e136620a481f717aa54f76893feb70555d62e49e5be1884c955ddf369feb2ba7b3b96b6316fd84dc150 SHA512 af3ead1ecd306eab5163f0ed86067fc072e3507f7f8fc4c6541913ed122734bc5eaf83d05f4c2e432198419906370fbea563fec266d58870c8fcc6a88ea1265c +EBUILD openjdk-17.0.8.1_p1.ebuild 7982 BLAKE2B a6b5313438dcff6872f949c9e6264295f11b18f0494bfcd88203e4f06633881467585779f3fede41142f911e5ea11db835d198003486f1cfd8e2e86b6eed4074 SHA512 3b1c1e4fb0f20d7a401ac9b4af8b3633620f72270087eec575423f88f161fbd8467c96e9e42042239eacf7b8e7f5c30d50aa85c13006f9783645dc9553421718 EBUILD openjdk-18.0.2_p05.ebuild 8349 BLAKE2B 40c766352be5104b3448a5ea506b9f236cf36dbbdf825bc93578c7830c3d340f83eb5dade233d4a0c3892a83d3d1ce0ec925c73e82241d5006544f51597f5624 SHA512 1c9641916ce24dfa6ece0908e971504f53e2f9eb6147bc6279b4e03c19857036063e2b9c61550c6cf010bf447ed2b4819cde170f9abb1ed38c691d625f285a2d EBUILD openjdk-19.0.2_p07.ebuild 8349 BLAKE2B 40c766352be5104b3448a5ea506b9f236cf36dbbdf825bc93578c7830c3d340f83eb5dade233d4a0c3892a83d3d1ce0ec925c73e82241d5006544f51597f5624 SHA512 1c9641916ce24dfa6ece0908e971504f53e2f9eb6147bc6279b4e03c19857036063e2b9c61550c6cf010bf447ed2b4819cde170f9abb1ed38c691d625f285a2d EBUILD openjdk-20.0.2_p09.ebuild 8349 BLAKE2B 40c766352be5104b3448a5ea506b9f236cf36dbbdf825bc93578c7830c3d340f83eb5dade233d4a0c3892a83d3d1ce0ec925c73e82241d5006544f51597f5624 SHA512 1c9641916ce24dfa6ece0908e971504f53e2f9eb6147bc6279b4e03c19857036063e2b9c61550c6cf010bf447ed2b4819cde170f9abb1ed38c691d625f285a2d diff --git a/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild b/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild index 7886017..2807fa1 100644 --- a/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild +++ b/dev-java/openjdk/openjdk-17.0.8.1_p1.ebuild @@ -27,10 +27,11 @@ SRC_URI=" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86" -IUSE="alsa big-endian cups debug doc examples headless-awt javafx lto selinux source systemtap" +IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source systemtap" REQUIRED_USE=" javafx? ( alsa !headless-awt ) + jbootstrap " COMMON_DEPEND=" @@ -91,6 +92,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" openjdk_check_requirements() { local M M=2048 + M=$(( $(usex jbootstrap 2 1) * $M )) M=$(( $(usex debug 3 1) * $M )) M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) @@ -218,7 +220,7 @@ src_compile() { LOG=debug NICE= # Use PORTAGE_NICENESS, don't adjust further down $(usex doc docs '') - $(product-images) + $(usex jbootstrap bootcycle-images product-images) ) emake "${myemakeargs[@]}" -j1 #nowarn }