[packages/cmake] fix JNI determination on x32; rel 2

[atler]

commit fa78faf9a7df2bacf1c277cec668e51b2475fabf
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Aug 16 11:45:04 2022 +0200

    fix JNI determination on x32; rel 2

 cmake-jni.patch | 9 +++++++++
 cmake.spec      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/cmake.spec b/cmake.spec
index 7020d7f..95f61d4 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -18,7 +18,7 @@ Summary:	Cross-platform, open-source make system
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
 Version:	3.23.1
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Building
 Source0:	https://cmake.org/files/v3.23/%{name}-%{version}.tar.gz
diff --git a/cmake-jni.patch b/cmake-jni.patch
index b402b93..cf9e3ec 100644
--- a/cmake-jni.patch
+++ b/cmake-jni.patch
@@ -1,5 +1,14 @@
 --- cmake-3.22.2/Modules/FindJNI.cmake.orig	2022-01-25 14:45:06.000000000 +0100
 +++ cmake-3.22.2/Modules/FindJNI.cmake	2022-02-15 19:29:09.377305753 +0100
+@@ -52,7 +52,7 @@
+     # 1.6.0_18 + icedtea patches. However, it would be much better to base the
+     # guess on the first part of the GNU config.guess platform triplet.
+     if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+-      if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
++      if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32" OR LIB_SUFFIX STREQUAL "x32")
+         set(_java_libarch "x32" "amd64" "i386")
+       else()
+         set(_java_libarch "amd64" "i386")
 @@ -188,49 +188,27 @@ if (WIN32)
  endif()
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cmake.git/commitdiff/34fc3d72fb7f818e1db7ec001695d69dfd5bba16