From 267c5bca73a091bf3dd1484ca8378eb0db95bf83 Mon Sep 17 00:00:00 2001 From: Hailiang Date: Fri, 16 May 2025 16:56:24 +0800 Subject: [PATCH] not modify lib64 to lib on sw_64 fix sw_64 portmidi Could NOT find JNI Signed-off-by: Hailiang (cherry picked from commit 892dbc447b2fc9719ef0fb241e0d70330e7373c4) --- cmake-3.22.0-sw.patch | 17 +---------------- cmake.spec | 6 +++++- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/cmake-3.22.0-sw.patch b/cmake-3.22.0-sw.patch index b2e7a2c..c1b2804 100755 --- a/cmake-3.22.0-sw.patch +++ b/cmake-3.22.0-sw.patch @@ -6,7 +6,7 @@ diff -Naur cmake-3.22.0.org/Modules/FindJNI.cmake cmake-3.22.0.sw/Modules/FindJN elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") set(_java_libarch "arm64" "aarch64") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sw_64") -+ set(_java_libarch "sw_64") ++ set(_java_libarch "sw_64" "sw64") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha") set(_java_libarch "alpha") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") @@ -19,21 +19,6 @@ diff -Naur cmake-3.22.0.org/Modules/FindJNI.cmake cmake-3.22.0.sw/Modules/FindJN DOC "jni_md.h jniport.h include directory" ) -diff -Naur cmake-3.22.0.org/Modules/GNUInstallDirs.cmake cmake-3.22.0.sw/Modules/GNUInstallDirs.cmake ---- cmake-3.22.0.org/Modules/GNUInstallDirs.cmake 2022-02-25 01:21:55.550000000 +0000 -+++ cmake-3.22.0.sw/Modules/GNUInstallDirs.cmake 2022-02-25 01:32:38.270000000 +0000 -@@ -286,9 +286,9 @@ - elseif(NOT DEFINED __system_type_for_install) - # not debian, alpine, arch, or conda so rely on CMAKE_SIZEOF_VOID_P: - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") -- set(_LIBDIR_DEFAULT "lib64") -+ set(_LIBDIR_DEFAULT "lib") - if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) -- set(__LAST_LIBDIR_DEFAULT "lib64") -+ set(__LAST_LIBDIR_DEFAULT "lib") - endif() - endif() - endif() diff -Naur cmake-3.22.0.org/Utilities/KWIML/include/kwiml/abi.h cmake-3.22.0.sw/Utilities/KWIML/include/kwiml/abi.h --- cmake-3.22.0.org/Utilities/KWIML/include/kwiml/abi.h 2022-02-25 01:21:57.660000000 +0000 +++ cmake-3.22.0.sw/Utilities/KWIML/include/kwiml/abi.h 2022-02-25 01:25:45.020000000 +0000 diff --git a/cmake.spec b/cmake.spec index d4377ae..a6bdda1 100644 --- a/cmake.spec +++ b/cmake.spec @@ -22,7 +22,7 @@ Name: cmake Version: 3.27.9 -Release: 6 +Release: 7 Summary: Cross-platform make system License: BSD and MIT and zlib URL: http://www.cmake.org @@ -302,6 +302,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Fri May 16 2025 mahailiang - 3.27.9-7 +- not modify lib64 to lib on sw_64 +- fix sw_64 portmidi Could NOT find JNI + * Thu Jan 23 2025 fuanan - 3.27.9-6 - remove the architecture judgment in the patches section; - include all patches in the source package. -- Gitee