From ea95ec605ba4b57a416eb2678d1f7d36a135954f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 5 Jul 2021 18:17:48 +0200
Subject: [PATCH] openjdk11: add openjdk11-static-libs subpackage.

Needed for tooling related to GraalVM.
---
 srcpkgs/openjdk11-static-libs |  1 +
 srcpkgs/openjdk11/template    | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/openjdk11-static-libs

diff --git a/srcpkgs/openjdk11-static-libs b/srcpkgs/openjdk11-static-libs
new file mode 120000
index 00000000000..8213494c49e
--- /dev/null
+++ b/srcpkgs/openjdk11-static-libs
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 87b309bfa01..7ff1a89d324 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=1
+revision=2
 _java_ver="${version%%.*}"
 _openjdk_version="openjdk-${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -24,7 +24,7 @@ configure_args="
  --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""
-make_build_args="images $(vopt_if docs docs)"
+make_build_args="images static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
  openssl zlib-devel which make-ca"
@@ -190,3 +190,12 @@ openjdk11-src_package() {
 		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
 	}
 }
+
+openjdk11-static-libs_package() {
+	notstrip=yes
+	short_desc+=" -- static libs"
+	pkg_install() {
+		vmkdir usr/lib/jvm/openjdk${_java_ver}
+		vcopy build/*-normal-*-release/images/static-libs/lib "usr/lib/jvm/openjdk${_java_ver}"
+	}
+}