diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2021-10-16 10:16:45 -0700 |
|---|---|---|
| committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2021-10-16 10:18:26 -0700 |
| commit | 74756002a71c05160fccd6f6985b8c27f278f171 (patch) | |
| tree | 605478a53eb1d75fceef8213d067b37001c92433 | |
| parent | dev-perl/Curses: Remove old (diff) | |
| download | gentoo-74756002.tar.gz gentoo-74756002.tar.bz2 gentoo-74756002.zip | |
dev-java/openjdk-bin: add musl support to -bin:17
Closes: https://github.com/gentoo/gentoo/pull/22595
Thanks-to: yemou Hannam meeyou@tuta.io
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
| -rw-r--r-- | dev-java/openjdk-bin/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild | 15 |
2 files changed, 14 insertions, 2 deletions
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest index 4a703dfcf3f5..ff8d3a984cd9 100644 --- a/dev-java/openjdk-bin/Manifest +++ b/dev-java/openjdk-bin/Manifest @@ -11,6 +11,7 @@ DIST OpenJDK11U-jdk_x64_mac_hotspot_11.0.12_7.tar.gz 191257594 BLAKE2B f747b108b DIST OpenJDK17-jdk_aarch64_linux_hotspot_17_35.tar.gz 188907472 BLAKE2B 7159e03fe2a9ae79bea6130574b484e9f1ecc0549065d31e019f9d90c299be4b4f4a09bea85e6ebb13eabb5eace3db0283f00f19d7bdf362e52849aeb476adf5 SHA512 1daec8504962c06cbafeb3265edf5e220adb75e7b9d11e8f92b784ee273623b770bb38182dbbab2ffd8751254667d972c99f3d859620751f94c9c1d1b603546d DIST OpenJDK17-jdk_arm_linux_hotspot_17_35.tar.gz 188807831 BLAKE2B 55e0d944f5d2f7f09ce9a6bd87d6d432f9b086083f906fa9aa6f85f0e006cf15bb88cc6433ce41d6840ab2d7bc6d07223b51a1855ceb937aff6d0142c3f87c63 SHA512 a20c0de63ea404653e54b7eb30fd9c8c66cf6aae43845fefc7a67edbfc60e777fc4bf1a16a7958a56b36a868a8b4ce75e065b78ccb74a8ff26efc61a90d6e498 DIST OpenJDK17-jdk_ppc64le_linux_hotspot_17_35.tar.gz 187664371 BLAKE2B c12df4a24cd14fb57e6757056931da69b067576d22fdc9493c3d8eee34cace10718dc234b4f1cf6b525ee082752cdc7de9e1bc6467f2ecfffd5fa391095662e6 SHA512 c1f3ce3d8d7e33dbf1a838fee054741cf1aa6133fe375ec8c8508072b9da78158bcbbe633f4cdd3b1b8dae4915418b26de2fd218354ae2264a3694aad5fc9cd9 +DIST OpenJDK17-jdk_x64_alpine-linux_hotspot_17_35.tar.gz 191382466 BLAKE2B 78b5e126b25bf6fa4471913cb209ff0f76838b44f1a2a5845cee190d2fa5b3957696f353ff8bcf7395a716b3ff22431e12be2f966457cf525fb89ff1a6f32d7c SHA512 2264bebae07d060ce34ef0b743d11afb06c66fcd21d2ff338c5fb641cc55b95d70b2e1b17456cf68264442e58d0dea3988a36ee29d7c2430ee8a8f84116a5584 DIST OpenJDK17-jdk_x64_linux_hotspot_17_35.tar.gz 192014376 BLAKE2B 6707451ca3aaa22f232592f6497899f4751a67cfce5c539a275806b551d3494c686905dd91c03ba6de64afc65841d1e9836a1dead4ce55d99df3da4a077aecb4 SHA512 9af1945e46a1b444cb49ec8e58e14650098266e29973688c2a25b3707d23bf90b0a1287ad0ea5c467425f959354359fcdf1eaa8bd68e784399a6780298b22a44 DIST OpenJDK17-jdk_x64_mac_hotspot_17_35.tar.gz 192417649 BLAKE2B 53fdd3f71b9c3860231451eb0f59414c03a863944c9b7f2106490c1d39a8b94715d1743bab10959fe513277f5fa9a4d397c76c464680f9b1f35d879e7c82ff05 SHA512 ebe2f1f936c93150f2bd5e2bb9b07b572eb14abd71ad7446dd0f5c511c8b6debc882d6ec69376b55a50b964c9a2b8efb52db96de1041dd2aa857bcdb64915494 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz 102423506 BLAKE2B dab839491d359e4366d316fd1a0eb3b7009e1739d7c6d4dc3ded47bd44fc7af36068d76183d9656d748beec0117bf95f09a78e577c3e1f685f0fb3c2e2d45e28 SHA512 6ca2dddd371223c0bae6caea1f4841d7d718b9ea812d914ec8fe3f03671e2176454ca094c05e55286ba0560e2897a515714bf607e868b4b0405b6bce03c5c22c diff --git a/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild b/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild index e7f747915308..29dfd60186eb 100644 --- a/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-17_p35.ebuild @@ -6,14 +6,24 @@ EAPI=6 inherit java-vm-2 toolchain-funcs abi_uri() { + local baseuri="https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/" + local musl= local os=linux + case ${2} in *-macos) os=mac ;; *-solaris) os=solaris ;; esac + + if [[ ${3} == musl ]]; then + os=alpine-linux + musl=true + fi + echo "${2-$1}? ( - https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz - )" + ${musl:+ elibc_musl? ( } + ${baseuri}/OpenJDK${SLOT}-jdk_${1}_${os}_hotspot_${MY_PV//+/_}.tar.gz + ${musl:+ ) } )" } MY_PV=${PV/_p/+} @@ -24,6 +34,7 @@ SRC_URI=" $(abi_uri aarch64 arm64) $(abi_uri ppc64le ppc64) $(abi_uri x64 amd64) + $(abi_uri x64 amd64 musl) $(abi_uri x64 x64-macos) " |