From 4059b91296dd71523ce75e885da5e1ad0efe536b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 4 Nov 2019 11:25:50 +0100 Subject: [PATCH] openjdk11: add bootstrap path for x86_64-musl --- srcpkgs/openjdk11/template | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index a13c7e492d7..8d82c10155f 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -25,9 +25,7 @@ configure_args=" --with-vendor-name="Void" --with-vendor-url="https://voidlinux.org/" --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues" - --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues" - --with-boot-jdk=/usr/lib/jvm/openjdk11-bin" - + --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues"" make_build_args="images $(vopt_if docs docs)" make_check_target="test-hotspot-gtest" hostmakedepends="pkg-config automake autoconf cpio unzip zip ca-certificates @@ -55,9 +53,17 @@ esac if [ "$CROSS_BUILD" ]; then hostmakedepends+=" openjdk11" configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11" -else +elif [ "$XBPS_ARCH" = "x86_64-musl" ]; then + hostmakedepends+=" libjpeg-turbo libXau libXdmcp libxcb libX11 libXext + libXrender libXtst libXi giflib libpng alsa-lib freetype lcms" + distfiles+=" https://alpha.de.repo.voidlinux.org/distfiles/openjdk-11.0.0.5+10-x86_64-musl.tar.gz" + checksum+=" 037520d9eb077628e137d638f3084689610e8a2fbc9efe50e10823dbac7897a4" + configure_args+=" --with-boot-jdk=${XBPS_BUILDDIR}/${wrksrc}/openjdk11" +elif [ "$XBPS_ARCH" = "x86_64" ]; then hostmakedepends+=" openjdk11-bin" configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11-bin" +else + broken="No suitable bootstrap binary found" fi alternatives=" @@ -121,6 +127,9 @@ post_extract() { if [ "$XBPS_TARGET_LIBC" = "musl" ]; then rm -r src/jdk.hotspot.agent fi + if [ "$XBPS_ARCH" = "x86_64-musl" ]; then + mv ${wrksrc}/../openjdk11 ${wrksrc}/openjdk11 + fi } post_patch() {