summaryrefslogtreecommitdiff
path: root/dev-java/openjdk
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/openjdk')
-rw-r--r--dev-java/openjdk/Manifest2
-rw-r--r--dev-java/openjdk/openjdk-8.442_p06.ebuild10
2 files changed, 11 insertions, 1 deletions
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 0b81308f84df..62bc7c22f8b7 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -26,5 +26,5 @@ EBUILD openjdk-11.0.26_p4.ebuild 9003 BLAKE2B 0c87b9a541af2b00783130dc50ea677d5b
EBUILD openjdk-17.0.14_p7.ebuild 9423 BLAKE2B 9d13f32fda92958be0f1216d286db971cb9e75a7b5b73f080e8f98139a65ddcabea885143707bbc400ddddb776c50a77485300efeaf7155ae9e260808d86783e SHA512 af4ecb092f74d9c16235bd3023f859338217f793ac91ddc51938be016306ec9a7d2de1ec5c9a003d44abb43d708a6c61bbc7a4b995dcba3b8a6c883e3f1f5838
EBUILD openjdk-21.0.6_p7.ebuild 9558 BLAKE2B 98c1c9f207ba3d94cb007035246f9b2ad4ce22b4a61ce30cc65a1dc373ebb6be79d2b3f6dad7fc5af276d9990a2e2eab321c2c14b98977695664ca5e9a52454a SHA512 e54f31b10a028b6e3a0f669d6d0d75f3e5f3916ea20cd3927f061cfff7f8f10ddc9e687845e24f1e86f4c8262a1e0e74ce9537135a57187b54bd0fc994cf81e5
EBUILD openjdk-25_p13.ebuild 9442 BLAKE2B 9a0e8ee1d523bfbc2243ac4625ded98b953a4e5fcba241e2d66db1397c01e093a500268d48d8a97f1c5d5c4ab838466f70bcd7ba614d39ea13a4a645716f7aec SHA512 7f3f6c90ffbfadd66879e0e35187842f7479d965036bce66205b9d01176cd97dcfaa44905a0724c4c86c0c7efd5d85ee7f2d1b19925f4ac463fe1176b3548514
-EBUILD openjdk-8.442_p06.ebuild 7819 BLAKE2B a4956dbe705709e25463bf87595cb76db4e8ab800d514e3786b469d893fb2017c4b42080ec74ad8d6a1ef9207d2e06f70f11a6b42761bb135e3fc5a661b7fa6b SHA512 7e5591ec8e539eb4bc9c9bec9e10aae1a9c54de9a1a25a8e1e55aa8288e0fb3e583357d8c34bd9097a93c09d0f1a4f691afefb7a7a523e13a084d9a232260332
+EBUILD openjdk-8.442_p06.ebuild 8146 BLAKE2B 013345cb16361dde5377292c2078a9aac3344680265432fb60045a37daf94b65bbf064d76446bf2d6f659f77e5a2d1a5ba9685d8b8e66aab319e23be6157ea6e SHA512 0a3b454c70fa87a625676b861276d3317d69fab24ba266bce54bb5008dd9738daeda13298ccc1e7bbe5ccd224c648c0fe7aa522ca165e3e4027e37e2f4a58216
MISC metadata.xml 1593 BLAKE2B 89674213fcbe29a938a4f0812445a42013c467ec3c1ffae7168438abe9214125d0db15f796b34252ca4b83d5aa31ae5949730bfa60a948cac0619cee9cec7941 SHA512 8355c2dc2e23922861989171b6168799074d518c5e5c7f54c8f8b09a1b94c971d90002753fe1b2981345d3bcae5928ea049b8af71279cb6e3d573a25a7b7fb49
diff --git a/dev-java/openjdk/openjdk-8.442_p06.ebuild b/dev-java/openjdk/openjdk-8.442_p06.ebuild
index a7cad0a4da65..2311722c03b2 100644
--- a/dev-java/openjdk/openjdk-8.442_p06.ebuild
+++ b/dev-java/openjdk/openjdk-8.442_p06.ebuild
@@ -96,6 +96,7 @@ DEPEND="
BDEPEND="
virtual/pkgconfig
+ sys-devel/gcc:*
"
PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
@@ -156,6 +157,15 @@ src_prepare() {
hotspot/make/linux/makefiles/gcc.make || die
chmod +x configure || die
+
+ # Force gcc because build failed with modern clang, #918655
+ if ! tc-is-gcc; then
+ ewarn "openjdk/8 can be built with gcc only."
+ ewarn "Ignoring CC=$(tc-getCC) and forcing ${CHOST}-gcc"
+ export CC=${CHOST}-gcc
+ export CXX=${CHOST}-g++
+ tc-is-gcc || die "tc-is-gcc failed in spite of CC=${CC}"
+ fi
}
src_configure() {