From 848c4b0718f87744084b8bd0b039bea3ea22e81d Mon Sep 17 00:00:00 2001 From: Hailiang Date: Fri, 16 May 2025 17:07:02 +0800 Subject: [PATCH] not modify lib64 to lib on sw_64 fix sw_64 portmidi Could NOT find JNI Signed-off-by: Hailiang --- cmake-3.31.6-sw.patch | 18 ++---------------- cmake.spec | 6 +++++- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/cmake-3.31.6-sw.patch b/cmake-3.31.6-sw.patch index 3d68f48..db31419 100644 --- a/cmake-3.31.6-sw.patch +++ b/cmake-3.31.6-sw.patch @@ -5,11 +5,10 @@ Subject: [PATCH] Fix build with sw_64 --- Modules/FindJNI.cmake | 3 +++ - Modules/GNUInstallDirs.cmake | 2 +- Utilities/KWIML/include/kwiml/abi.h | 4 ++++ Utilities/cmlibrhash/librhash/byte_order.h | 2 +- Utilities/cmlibuv/src/win/util.c | 4 ++++ - 5 files changed, 13 insertions(+), 2 deletions(-) + 4 files changed, 12 insertions(+), 1 deletions(-) diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 82e3d88..02ae823 100644 @@ -20,7 +19,7 @@ index 82e3d88..02ae823 100644 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") @@ -32,19 +31,6 @@ index 82e3d88..02ae823 100644 ${JAVA_INCLUDE_PATH}/aix DOC "jni_md.h jniport.h include directory" ) -diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake -index ed34c4a..d95c528 100644 ---- a/Modules/GNUInstallDirs.cmake -+++ b/Modules/GNUInstallDirs.cmake -@@ -295,7 +295,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set - endif() - 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") -+ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^sw_64") - set(_LIBDIR_DEFAULT "lib64") - if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) - set(__LAST_LIBDIR_DEFAULT "lib64") diff --git a/Utilities/KWIML/include/kwiml/abi.h b/Utilities/KWIML/include/kwiml/abi.h index cefe9ce..906b7c8 100644 --- a/Utilities/KWIML/include/kwiml/abi.h diff --git a/cmake.spec b/cmake.spec index d13c41d..32ecae4 100644 --- a/cmake.spec +++ b/cmake.spec @@ -21,7 +21,7 @@ Name: cmake Version: 3.31.6 %global major_version %(echo %{version} | awk -F. '{print $1}') -Release: 1 +Release: 2 Summary: Cross-platform make system License: BSD-3-Clause AND MIT-open-group AND Zlib URL: https://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.31.6-2 +- not modify lib64 to lib on sw_64 +- fix sw_64 portmidi Could NOT find JNI + * Thu Mar 20 2025 Funda Wang - 3.31.6-1 - update to version 3.31.6 -- Gitee