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

---
 srcpkgs/openjdk17-static-libs |  1 +
 srcpkgs/openjdk17/template    | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/openjdk17-static-libs

diff --git a/srcpkgs/openjdk17-static-libs b/srcpkgs/openjdk17-static-libs
new file mode 120000
index 00000000000..99ab1cb1b0d
--- /dev/null
+++ b/srcpkgs/openjdk17-static-libs
@@ -0,0 +1 @@
+openjdk17
\ No newline at end of file
diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index e4b6a8a3b5b..40e1e42d72f 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk17'
 pkgname=openjdk17
 version=17.0.5+7
-revision=1
+revision=2
 _gtest_ver=1.8.1
 _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
@@ -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
@@ -159,6 +159,7 @@ do_configure() {
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/bin
 	mv ${DESTDIR}/usr/lib/jvm/openjdk-${_base_version} ${DESTDIR}/$_jdk_home
+	vcopy build/*-release/images/static-libs/lib $_jdk_home
 	vmkdir $_jdk_home/lib/security
 	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/$_jdk_home/bin/keytool"
 	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/$_jdk_home/lib/security/
@@ -166,7 +167,7 @@ post_install() {
 	rm -rf ./ca
 }
 
-subpackages="openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods"
+subpackages="openjdk17-static-libs openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods"
 
 openjdk17-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -219,6 +220,13 @@ openjdk17-src_package() {
 	}
 }
 
+openjdk17-static-libs_package() {
+	short_desc+=" - static libs"
+	pkg_install() {
+		vmove "$_jdk_home/lib/*.a"
+	}
+}
+
 openjdk17-jmods_package() {
 	short_desc+=" - JMODs"
 	depends="${pkgname}-${version}_${revision}"