Browse Source

Fix openjdk:9 dependencies.

master
Andrius Štikonas 4 months ago
parent
commit
3c5f3864e2
  1. 2
      dev-java/openjdk/Manifest
  2. 29
      dev-java/openjdk/openjdk-9.0.4_p12.ebuild

2
dev-java/openjdk/Manifest

@ -99,5 +99,5 @@ EBUILD openjdk-14.0.2_p01.ebuild 8419 BLAKE2B cdf793ba4d051f57c89027fca2a4266622
EBUILD openjdk-15.0.0_p36.ebuild 8645 BLAKE2B 8a4516e98f32bb038b6a5b0123bba4615842c6d19ed1fc1416c71f789d5ca6e366d8a71501d650c3a77304d80f3140a1e437b98b3045186ee538a81307d5f457 SHA512 7e637fae9f756c290479602175f8c9ca5d31a5d75fe69b21fb54e0aba2b559d4329e03f20935b8109a946bcf6063996f6f42a25693c3f2ad62590ff6bbb1a379
EBUILD openjdk-16.0.0_p36.ebuild 8496 BLAKE2B a98e9f85c96b6d0098ce21e337b5764c88c9933eb8abf94c0906430b60a85657360fb903eec0973262a268b8781324deea8d21a9025e91dbdf19796dc07b9c27 SHA512 b02a2fed9ae8ff387ae6691e21f2dba0b3f3cc1c636a9c5ea328f9dd41effb11e809bc77ca0ac84e980f07480413066b1f76f5f3f923d32e290ecb757f8fa687
EBUILD openjdk-8.272_p10.ebuild 8024 BLAKE2B dfb1d42eaad81e5942cacf16a28286c571c673aa47b3c951a9a42e94bc443e77c2a0b2f8099542e0eff7f8e0b11cca2413efdbd388555d2a0830d859f659dffa SHA512 af55ddfe5a2c39468590ca70216d64e3b211890a662f9bbd064fcec7f61f8e0d151c594653c27554ce49403c8ef0cea7c76e5c635a95121978cda4e7de11aa03
EBUILD openjdk-9.0.4_p12.ebuild 8182 BLAKE2B 745a457dcf08103e498da991501464ccb2de906145e5d8d45442ddf9bdd9bc50dc761d5fb6b489fa5c17419476fb36fe380f6ef880642ff68e9b1a66bb99940f SHA512 8239c6a2060ba559e4c319b528b8eeb7aa9fe6e77111ccd265d713bd4a613d90c2f1cc724085c667034e88901530d90a9e0a4413091150a4d0dd19f159f60a2f
EBUILD openjdk-9.0.4_p12.ebuild 8125 BLAKE2B e69371353d26c4662c69389c86f50820468c09210b5f1700a22a55055034a09c74831288ea5bcfc46ffdea0169007f96ad6bfcce3fca3845644ec5fe6365b171 SHA512 e63191f0cb2feabd909c4df64e5134f07dc4b9b21a16215e5e64ef4c61a5a4b207ea2b83462cd94dbc201df577aeb593d55c8ac92dc506033de0c7c663f96ab1
MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0

29
dev-java/openjdk/openjdk-9.0.4_p12.ebuild

@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -69,7 +69,7 @@ DEPEND="
dev-java/icedtea:${SLOT}
dev-java/openjdk-bin:$((SLOT-1))[gentoo-vm]
dev-java/icedtea-bin:$((SLOT-1))
dev-java/openjdk:$((SLOT-1))[gentoo-vm]
dev-java/openjdk:$((SLOT-1))
dev-java/icedtea:$((SLOT-1))
)
"
@ -151,19 +151,19 @@ src_prepare() {
chmod +x configure || die
# conditionally apply patches for musl compatibility
if use elibc_musl; then
eapply "${FILESDIR}/musl/${SLOT}/build.patch"
eapply "${FILESDIR}/musl/${SLOT}/fix-bootjdk-check.patch"
# conditionally apply patches for musl compatibility
if use elibc_musl; then
eapply "${FILESDIR}/musl/${SLOT}/build.patch"
eapply "${FILESDIR}/musl/${SLOT}/fix-bootjdk-check.patch"
eapply "${FILESDIR}/musl/${SLOT}/make-4.3.patch"
eapply "${FILESDIR}/musl/${SLOT}/ppc64le.patch"
eapply "${FILESDIR}/musl/${SLOT}/aarch64.patch"
fi
# conditionally remove not compilable module (hotspot jdk.hotspot.agent)
# this needs libthread_db which is only provided by glibc
#
# haven't found any way to disable this module so just remove it.
eapply "${FILESDIR}/musl/${SLOT}/ppc64le.patch"
eapply "${FILESDIR}/musl/${SLOT}/aarch64.patch"
fi
# conditionally remove not compilable module (hotspot jdk.hotspot.agent)
# this needs libthread_db which is only provided by glibc
#
# haven't found any way to disable this module so just remove it.
if use elibc_musl; then
rm -rf "${S}"/hotspot/src/jdk.hotspot.agent || die "failed to remove HotSpot agent"
fi
@ -278,4 +278,3 @@ pkg_postinst() {
ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
fi
}
Loading…
Cancel
Save