From b3e7eece201a98af3a68685a8eb31eb6238d4fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:09 +0700
Subject: [PATCH] openjdk15-bootstrap: use create_wrksrc

---
 srcpkgs/openjdk15-bootstrap/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index c1ce79ae269..62f2626c0d5 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -7,7 +7,8 @@ _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 archs="x86_64* i686* aarch64* armv7* ppc64*"
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+create_wrksrc=yes
+build_wrksrc=openjdk
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -18,7 +19,7 @@ configure_args="--disable-warnings-as-errors
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-gtest=${XBPS_BUILDDIR}/googletest-release-1.8.1
+ --with-gtest=${XBPS_BUILDDIR}/${pkgname}-${version}/googletest-release-1.8.1
  --with-debug-level=release
  --with-jobs=${XBPS_ORIG_MAKEJOBS}
  --with-version-pre=
@@ -70,9 +71,10 @@ if [ -n "$XBPS_DEBUG_PKGS" ]; then
 fi
 
 post_extract() {
-	chmod +x configure
+	mv jdk* openjdk
+	chmod +x openjdk/configure
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		rm -r src/jdk.hotspot.agent
+		rm -r openjdk/src/jdk.hotspot.agent
 	fi
 }
 
@@ -118,8 +120,3 @@ post_install() {
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
-
-do_clean() {
-	# clean up gtest
-	rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}