From 8bf0aad0e429afa42a3327169c36e854f22b5d3547b178ea7ae514868e9cfb07 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 14 Feb 2024 08:39:33 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:Factory/java-21-openjdk?expand=0&rev=36

---
 java-21-openjdk.changes |  5 +++--
 java-21-openjdk.spec    | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/java-21-openjdk.changes b/java-21-openjdk.changes
index 160b202..e82822a 100644
--- a/java-21-openjdk.changes
+++ b/java-21-openjdk.changes
@@ -1,7 +1,8 @@
 -------------------------------------------------------------------
-Tue Feb 13 18:33:31 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+Tue Feb 13 17:20:01 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
-- Build arm6 as JIT architecture
+- Add a workaround to allow cmake to find JVM library on zero
+  architectures
 
 -------------------------------------------------------------------
 Wed Feb  7 13:59:23 UTC 2024 - Fridrich Strba <fstrba@suse.com>
diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec
index ceb5d5b..092f26a 100644
--- a/java-21-openjdk.spec
+++ b/java-21-openjdk.spec
@@ -59,6 +59,9 @@
 %ifnarch %{jit_arches}
 %global _with_zero 1
 %endif
+%ifarch %{arm6}
+%global _with_zero 1
+%endif
 %if %{debug}
 %global debugbuild slowdebug
 %else
@@ -647,6 +650,16 @@ find %{buildroot}%{_jvmdir}/%{sdkdir}/demo \
 %fdupes -s %{buildroot}/%{_jvmdir}/%{sdkdir}/demo
 %fdupes -s %{buildroot}%{_javadocdir}/%{sdklnk}
 
+%if %{with zero}
+pushd %{buildroot}%{_jvmdir}/%{sdkdir}/lib
+if [ ! -d server ]; then
+  if [ -d zero ]; then
+    ln -s zero server
+  fi
+fi
+popd
+%endif
+
 %post headless
 ext=.gz
 update-alternatives \
@@ -850,6 +863,7 @@ fi
 %dir %{_jvmdir}/%{sdkdir}/lib/jfr
 %if %{with zero}
 %dir %{_jvmdir}/%{sdkdir}/lib/zero
+%{_jvmdir}/%{sdkdir}/lib/server
 %else
 %dir %{_jvmdir}/%{sdkdir}/lib/server
 %endif