From f37267a554fa06c8adc641f2ab78f78a582ba209 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <grimler@termux.org>
Date: Sun, 29 May 2022 20:06:32 +0200
Subject: [PATCH] enhance(openjdk-17): make debug builds possible

%ci:no-build
---
 packages/openjdk-17/build.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/openjdk-17/build.sh b/packages/openjdk-17/build.sh
index 195a35c3ba..e62c19279a 100644
--- a/packages/openjdk-17/build.sh
+++ b/packages/openjdk-17/build.sh
@@ -10,7 +10,6 @@ TERMUX_PKG_DEPENDS="freetype, giflib, libandroid-shmem, libandroid-spawn, libico
 TERMUX_PKG_BUILD_DEPENDS="cups, fontconfig, libpng, libx11, libxrender"
 TERMUX_PKG_SUGGESTS="cups, fontconfig, libx11, libxrender"
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_HAS_DEBUG=false
 
 termux_step_pre_configure() {
 	unset JAVA_HOME
@@ -56,6 +55,12 @@ termux_step_pre_configure() {
 }
 
 termux_step_configure() {
+	if [ $TERMUX_DEBUG_BUILD = true ]; then
+		_BUILD_TYPE="fastdebug"
+	else
+		_BUILD_TYPE="release"
+	fi
+
 	local jdk_ldflags="-L${TERMUX_PREFIX}/lib -Wl,-rpath=$TERMUX_PREFIX/opt/openjdk/lib -Wl,-rpath=${TERMUX_PREFIX}/lib -Wl,--enable-new-dtags"
 	bash ./configure \
 		--openjdk-target=$TERMUX_HOST_PLATFORM \
@@ -68,7 +73,6 @@ termux_step_configure() {
 		--with-toolchain-type=gcc \
 		--with-jvm-variants=server \
 		--with-devkit="$TERMUX_STANDALONE_TOOLCHAIN" \
-		--with-debug-level=release \
 		--with-cups-include="$TERMUX_PREFIX/include" \
 		--with-fontconfig-include="$TERMUX_PREFIX/include" \
 		--with-freetype-include="$TERMUX_PREFIX/include/freetype2" \
@@ -80,6 +84,7 @@ termux_step_configure() {
 		--x-includes="$TERMUX_PREFIX/include/X11" \
 		--x-libraries="$TERMUX_PREFIX/lib" \
 		--with-x="$TERMUX_PREFIX/include/X11" \
+		--with-debug-level="${_BUILD_TYPE}"
 		AR="$AR" \
 		NM="$NM" \
 		OBJCOPY="$OBJCOPY" \
@@ -88,7 +93,7 @@ termux_step_configure() {
 }
 
 termux_step_make() {
-	cd build/linux-${TERMUX_ARCH/i686/x86}-server-release
+	cd build/linux-${TERMUX_ARCH/i686/x86}-server-$_BUILD_TYPE
 	make JOBS=1 images
 
 	# Delete created library stubs.
@@ -98,7 +103,7 @@ termux_step_make() {
 termux_step_make_install() {
 	rm -rf $TERMUX_PREFIX/opt/openjdk
 	mkdir -p $TERMUX_PREFIX/opt/openjdk
-	cp -r build/linux-${TERMUX_ARCH/i686/x86}-server-release/images/jdk/* \
+	cp -r build/linux-${TERMUX_ARCH/i686/x86}-server-${_BUILD_TYPE}/images/jdk/* \
 		$TERMUX_PREFIX/opt/openjdk/
 	find $TERMUX_PREFIX/opt/openjdk -name "*.debuginfo" -delete