openjdk: make openjdk-10 ebuild more similar to others.

This commit is contained in:
Andrius Štikonas 2022-01-09 00:31:04 +00:00
parent 021eb3ae9e
commit dde835a81a
3 changed files with 11 additions and 9 deletions

View File

@ -101,7 +101,7 @@ DIST openjdk-langtools-8.272_p10.tar.bz2 2399755 BLAKE2B 34ffa30993fa9f42ed2fa96
DIST openjdk-langtools-9.0.4_p12.tar.bz2 4497608 BLAKE2B 382bfa6119345f1983cf5a168fa0d2e523a6dad5ad35f446cd11d6f6f24bb5850e65d1d0aab7fe8298ba7a2d7fe3ebb8a472c567a46577dff17ab80ea32abae9 SHA512 ef3c70be906a4b0dd9c9195c88da045909ee3ef144941fb7b4495ed66b4162f481095cad87626d2bd38e5a62134b440223cd008dd6123b6b43c00e338610a692
DIST openjdk-nashorn-8.272_p10.tar.bz2 2850055 BLAKE2B 2348c0f45916101d9fcb4aaa283d2c03be5b28decf12248ec930b9d726e346d0884dd64a22627e2f2fd8260c8755d0bc46a1cf6fecf691a30a7f4b54f6a293a9 SHA512 754fcdca5e0ce523d73cbdfbdcaaa13677ed8c2b72c5ae04ff1cc77fd73469f3366e51add68b13bac3c43800fecfcbb93bf4fcf7469258c4adc57e414b105ef5
DIST openjdk-nashorn-9.0.4_p12.tar.bz2 8961760 BLAKE2B 2ff03adf87a0e0561d52529cf95b8fb827e75773462be7ecddd60dc966e1a229b897eb65a0301a531dfcaff884122e612f1a24b5d5fbc8f0352a8d84218423d7 SHA512 848c6ece418e250561572ad704baeb565580098cfc5f849d4e1a3b41b916aae3487eb4d8d0b319f3a503d122ec064ed4de0678d06821c9a2bdb09c990e589c97
EBUILD openjdk-10.0.2_p13.ebuild 8281 BLAKE2B cfeaff3e4311349241c04566d2a909b2476bf3a88c7e4a8e737590f42782ac99f1a6f6a688e91643e0c4edd752d947ed06036b7ed8c9aef06556080f054dc60e SHA512 07d4b63a0c0433b242eee6520ceaadf510ea38bf29e8d3c4decdb046b9f2c108471de047c03b0b54e4307112f4ff910bfc35cbef5b210e68ccb2a63906769bdf
EBUILD openjdk-10.0.2_p13.ebuild 8329 BLAKE2B 4b7d2db3c90be7e2f5a40eeb6e7b6a850ab6344ab1e4f6df8682606f603d80e87a868c950bc50eb6deeb9389949506c403009df5424a528a179dbfd23ac0e871 SHA512 14a9f60ad1df2d8477905c1be25898ff516dd9586a9a0ed3b9d9c4c294c2409adc860d85ac95020564b9d9e22f5793594870b530112172a6e77eb35a27916305
EBUILD openjdk-11.0.9_p11.ebuild 8322 BLAKE2B e373727aa476dd096347cf54f630c86cd550352607fb4e76fc31d4dfdc2f818aea55c10cb30bd6c4260bfd8ad97231a038a638a6721fbd2fb0c1426672724e1d SHA512 1d46de59f8c1587738a03019269f3d63b08babce1dd936eb565b453494ffe3e4f1dcc576df377db17ca9ade79f282818de76f70c4c9d61e543afa739a5de3290
EBUILD openjdk-12.0.2_p01.ebuild 8828 BLAKE2B 49f0ffbc8481e677a782f943d08462e69f67d787e6ff8b4d0605145634c1eee262d4c3e13b97c42e77518fc76053fb616b48c34b3eb7d1d2e87f95b9e2491a4a SHA512 471c720b21e36cbab0b997f193f3e5955edf6ed0131280c4ddfb60c4a529ebada5c5e1c48d288561e5b3cfa328855901d0625544413cf55e5dc4a0fcb970daaf
EBUILD openjdk-13.0.4_p01.ebuild 8297 BLAKE2B 56a6230eabbac03d0ec44ccd1b1327687eb8e959cffcdbdf20708a81ab23f5079d3631caf616702d997e6682d1eaabcad493b7e20e9bea6f216ff45c5a0e8f55 SHA512 d6b96834a29ba3715bcde4678b612f0e43fa36acb1dad080f1c7b8f7eb1205eac8fa5e1e25c4b9cbb209d7819c4b8d73d46410bfcc5f6ce71a99cc06eded3e6a
@ -109,6 +109,6 @@ EBUILD openjdk-14.0.2_p01.ebuild 8299 BLAKE2B e6b2085ec40715bc5c66e36b7e77009bb5
EBUILD openjdk-15.0.0_p36.ebuild 8531 BLAKE2B 1a74403a0458a8ea497b8646ca3447bc97c3907bddcb2a8f17ab57bd2880ee1d5ed43046c8654fc24c5fbe682bcfb75e4470763a171b6e6a05b86fadb115e3ec SHA512 d425e28d5b52d4302523a5ce73e64934f25c6d6c4c3e73ca20eedea5e9d6beb90d6e4399a70de3e5122e7e0f13fd4698cb09f813bd64825678d20051aec12a16
EBUILD openjdk-16.0.0_p36.ebuild 8349 BLAKE2B b15021ca0e8c4c2237ea33e933952d676342f22330aef38a0f3b41dc2579ff0d773799c52f4e13faa37ef65f2171264fcea859f145d9aa6cda5c315eac9844fe SHA512 be109ab81e47004055888e92553634ab364dda54f106b9d0d88282a1466ae2828251bcf510734a7faf9d110138a94082d40b2ca4fdf0d982e7889de92b34eacc
EBUILD openjdk-17.0.0_p35.ebuild 8351 BLAKE2B 747abf7afffb84365da84dd9e6119c8b649310cc0486b25ec71980e5e1abf05f8a0f50de056ea9b8df9404b78fb38fa83377905c3b2855ad936ab58e60c051b5 SHA512 181c3c2e4e6a62af7f8edc0ac0bad075f037a8e528de7345c8a45384ff76acb54839f1cfa7332bd09d9ab4e50732f30aa4920d839768e6af5cddc38340102e7e
EBUILD openjdk-8.272_p10.ebuild 8089 BLAKE2B b4389633ce651fe874103a98e07c2b97b0b737d105a73c9c136f83341ce62e6c6f8cb3ba7399056dc59db051330305c74ed491e01f40de623bf264bf9a66c325 SHA512 7e2bc5cc6a23835cc001b0a1d29661e2044c8060015561b455e2598aeced1463f75d3ffcd464ce1eeae6b0f89e87e825757326255c982843c4628c9f56f4c0bd
EBUILD openjdk-8.272_p10.ebuild 8003 BLAKE2B 529d5ff4382b67bac38cd2168dc218b0c31fd9f4c547c818c91a897fdf17a696da099d919c54ecf5420d6df78f5af0209fedaf3fe6e4eeae3ec98312487a0a83 SHA512 b6729cab6a9cc1a1a2b2ef0f4c5ad9da20fd2ae71d807b49c4c1df4a2bbde46d64f2b1f4af6e41e9ace4fa1361c686654f7d6b14040a62878f29a4e0f4a9133a
EBUILD openjdk-9.0.4_p12.ebuild 8381 BLAKE2B 6fb0588ad8348e8098d217762d327fc98e6bc0bd455259ac6ff47328afe5648e4bdbf5b379a3ea0e5c636e1affa87994832617fd2f5e89b7b86fb6eb8169ce38 SHA512 f896faeb7ffc070720f61a76b64737724d716c9d1452acda41d37b94e6e4cb03e4ef1fce960726d0ea0a5bc235ed876e90ec4a13f75868261f9729aae190a624
MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0

View File

@ -214,10 +214,13 @@ src_configure() {
}
src_compile() {
emake -j1 \
$(usex doc docs '') \
JOBS=$(makeopts_jobs) LOG=debug \
local myemakeargs=(
JOBS=$(makeopts_jobs)
LOG=debug
$(usex doc docs '')
product-images
)
emake "${myemakeargs[@]}" -j1 #nowarn
}
src_install() {

View File

@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -44,7 +44,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="$(ver_cut 1)"
KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap +pch selinux source"
IUSE="alsa debug cups doc examples headless-awt javafx +pch selinux source"
COMMON_DEPEND="
media-libs/freetype:2=
@ -97,7 +97,6 @@ openjdk_check_requirements() {
local M
M=2048
M=$(( $(usex debug 3 1) * $M ))
M=$(( $(usex jbootstrap 2 1) * $M ))
M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
@ -221,7 +220,7 @@ src_compile() {
JOBS=$(makeopts_jobs)
LOG=debug
$(usex doc docs '')
$(usex jbootstrap bootcycle-images images)
images
)
emake "${myemakeargs[@]}" -j1 #nowarn
}