Accepting request 1146626 from home:fstrba:branches:devel:tools:building

Fix detection of libjvm of ZERO JVM

OBS-URL: https://build.opensuse.org/request/show/1146626
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=569

cmake-zerojvm.patch

@@ -0,0 +1,10 @@
+--- cmake-3.28.1/Modules/FindJNI.cmake	2024-02-14 13:10:42.173018608 +0100
++++ cmake-3.28.1/Modules/FindJNI.cmake	2024-02-14 17:43:00.956527142 +0100
+@@ -344,6 +344,7 @@
+     "${dir}"
+     "${dir}/client"
+     "${dir}/server"
++    "${dir}/zero"
+     # IBM SDK, Java Technology Edition, specific paths
+     "${dir}/j9vm"
+     "${dir}/default"

cmake.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 14 16:46:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * cmake-zerojvm.patch
+    + fix JVM detection on JDKs with ZERO virtual machine, like
+      java-21-openjdk for armv6l
+
 -------------------------------------------------------------------
 Fri Jan 19 15:26:23 UTC 2024 - Dirk Müller <dmueller@suse.com>
 

cmake.spec

@@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package cmake
 #
 # Copyright (c) 2024 SUSE LLC
 #
@@ -63,6 +63,7 @@ Source99:       README.SUSE
 Patch0:         cmake-fix-ruby-test.patch
 # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice
 Patch1:         feature-suse-python-interp-search-order.patch
+Patch2:         cmake-zerojvm.patch
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig