From fa78faf9a7df2bacf1c277cec668e51b2475fabf Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 16 Aug 2022 11:45:04 +0200 Subject: [PATCH] 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-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() 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 -- 2.44.0