From 3dd76a4b8eb80c32c0c19982028e618f649478b9 Mon Sep 17 00:00:00 2001
From: Shulhan <ms@kilabit.info>
Date: Sun, 30 Nov 2025 14:08:36 +0700
Subject: all: another fix for building with JDK 17

Turns out setting the java-environment=17 on makedepends does not fix
the issues.
The java-runtime-headless requirement in depends keep installing jdk25
and set it as default JDK.
---
 .SRCINFO | 4 ++--
 PKGBUILD | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 86c45b1..210d49a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,13 +10,13 @@ pkgbase = google-cloud-ops-agent-git
 	makedepends = git
 	makedepends = go
 	makedepends = gradle
-	makedepends = java-environment=17
+	makedepends = jdk17-openjdk
 	makedepends = pkg-config
 	makedepends = rsync
 	makedepends = unzip
 	makedepends = zip
 	depends = libyaml
-	depends = java-runtime-headless
+	depends = jdk-openjdk
 	provides = google-cloud-ops-agent
 	conflicts = stackdriver-collectd
 	source = google-cloud-ops-agent-git::git+https://github.com/GoogleCloudPlatform/ops-agent.git
diff --git a/PKGBUILD b/PKGBUILD
index 385a8fe..3c2f8dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,14 +12,14 @@ groups=()
 
 depends=(
 	'libyaml'
-	'java-runtime-headless'
+	'jdk-openjdk'
 )
 makedepends=(
 	'cmake'
 	'git'
 	'go'
 	'gradle'
-	'java-environment=17'
+	'jdk17-openjdk'
 	'pkg-config'
 	'rsync'
 	'unzip'
@@ -79,6 +79,8 @@ build() {
 	git apply "${srcdir}/0002-builds_otel.sh.patch"
 
 	echo "--- Building otel ..."
+	export JAVA_HOME='/usr/lib/jvm/java-17-openjdk'
+	export PATH="${JAVA_HOME}/bin:${PATH}"
 	java --version
 	CGO_ENABLED=1 ./builds/otel.sh "$_destdir"
 
-- 
cgit v1.3