From 2d66aa1b1618c4ff6ac6328fa8e480bc46ff66e4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 1 Mar 2023 11:12:36 -0500
Subject: [PATCH 1/2] openjdk11: remove useless nostrep from -static-libs

it wasn't doing anything anyways, it was "notstrip"
---
 srcpkgs/openjdk11/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 173aac14b5d5..9039332ad868 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -212,7 +212,6 @@ openjdk11-src_package() {
 }
 
 openjdk11-static-libs_package() {
-	notstrip=yes
 	short_desc+=" - static libs"
 	pkg_install() {
 		vmkdir $_jdk_home

From aafb44b899c62f9a344f4f1a9872bca4c4f55344 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 1 Mar 2023 11:13:09 -0500
Subject: [PATCH 2/2] openjdk17: static libs subpackage

---
 srcpkgs/openjdk17/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index e4b6a8a3b5bb..c72606b9311d 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -30,7 +30,7 @@ configure_args="--disable-warnings-as-errors
  --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_install_args="INSTALL_PREFIX=\"${DESTDIR}/usr/lib\""
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -166,7 +166,7 @@ post_install() {
 	rm -rf ./ca
 }
 
-subpackages="openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods"
+subpackages="openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods openjdk17-static-libs"
 
 openjdk17-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -219,6 +219,14 @@ openjdk17-src_package() {
 	}
 }
 
+openjdk11-static-libs_package() {
+	short_desc+=" - static libs"
+	pkg_install() {
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
+	}
+}
+
 openjdk17-jmods_package() {
 	short_desc+=" - JMODs"
 	depends="${pkgname}-${version}_${revision}"