diff --git a/cmake-SW-only-support-that-libraries-in-usr-lib.patch b/cmake-SW-only-support-that-libraries-in-usr-lib.patch new file mode 100644 index 0000000000000000000000000000000000000000..c5f5b1e3d7d6e0f5b9020bc569174675d0ac6afa --- /dev/null +++ b/cmake-SW-only-support-that-libraries-in-usr-lib.patch @@ -0,0 +1,28 @@ +From ca824a680889e5a47dff17853ecf3f2999875c6d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E9=97=AE=E4=B9=A6?= +Date: Wed, 30 Aug 2023 10:55:53 +0800 +Subject: [PATCH] SW only support that libraries in /usr/lib. + +Signed-off-by: Weisson +--- + Modules/GNUInstallDirs.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake +index e149f4c5..6fad0bce 100644 +--- a/Modules/GNUInstallDirs.cmake ++++ b/Modules/GNUInstallDirs.cmake +@@ -252,9 +252,9 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set + endif() + else() # not debian, 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() +-- +2.20.1.4621.g47101605 diff --git a/cmake-add-sw.patch b/cmake-add-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..db8a16ae6474b6ef79fd1bcc3636275eca9c3827 --- /dev/null +++ b/cmake-add-sw.patch @@ -0,0 +1,80 @@ +From 021a1897e708b69766c1800892aced403fc86b76 Mon Sep 17 00:00:00 2001 +From: wxiat +Date: Mon, 12 Jun 2023 17:10:39 +0800 +Subject: [PATCH] add sw + +Signed-off-by: wxiat +--- + Modules/FindJNI.cmake | 3 + + Utilities/KWIML/include/kwiml/abi.h | 4 + + Utilities/cmlibrhash/librhash/byte_order.h | 2 +- + Utilities/cmlibuv/src/win/util.c | 4 + + 6 files changed, 437 insertions(+), 3 deletions(-) + +diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake +index 5aa2d601..c8463c10 100644 +--- a/Modules/FindJNI.cmake ++++ b/Modules/FindJNI.cmake +@@ -61,6 +61,8 @@ macro(java_append_library_directories _var) + set(_java_libarch "i386") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") + set(_java_libarch "arm64" "aarch64") ++ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^sw_64") ++ set(_java_libarch "sw_64") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^alpha") + set(_java_libarch "alpha") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") +@@ -363,6 +365,7 @@ find_path(JAVA_INCLUDE_PATH2 NAMES jni_md.h jniport.h + ${JAVA_INCLUDE_PATH}/solaris + ${JAVA_INCLUDE_PATH}/hp-ux + ${JAVA_INCLUDE_PATH}/alpha ++ ${JAVA_INCLUDE_PATH}/sw_64 + ${JAVA_INCLUDE_PATH}/aix + ) + +diff --git a/Utilities/KWIML/include/kwiml/abi.h b/Utilities/KWIML/include/kwiml/abi.h +index 0437854d..91a37046 100644 +--- a/Utilities/KWIML/include/kwiml/abi.h ++++ b/Utilities/KWIML/include/kwiml/abi.h +@@ -363,6 +363,10 @@ suppression macro KWIML_ABI_NO_VERIFY was defined. + #elif defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__) + # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE + ++/* Sw_64 */ ++#elif defined(__sw_64) || defined(__sw_64__) || defined(_M_SW_64) ++# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE ++ + /* Alpha */ + #elif defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA) + # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE +diff --git a/Utilities/cmlibrhash/librhash/byte_order.h b/Utilities/cmlibrhash/librhash/byte_order.h +index cfb9e25e..3a100409 100644 +--- a/Utilities/cmlibrhash/librhash/byte_order.h ++++ b/Utilities/cmlibrhash/librhash/byte_order.h +@@ -75,7 +75,7 @@ extern "C" { + /* try detecting endianness by CPU */ + #ifdef RHASH_BYTE_ORDER + #elif defined(CPU_IA32) || defined(CPU_X64) || defined(__ia64) || defined(__ia64__) || \ +- defined(__alpha__) || defined(_M_ALPHA) || defined(vax) || defined(MIPSEL) || \ ++ defined(__alpha__) || defined(_M_ALPHA) || defined(__sw_64__) || defined(_M_SW_64) || defined(vax) || defined(MIPSEL) || \ + defined(_ARM_) || defined(__arm__) + # define RHASH_BYTE_ORDER RHASH_BYTE_ORDER_LE + #elif defined(__sparc) || defined(__sparc__) || defined(sparc) || \ +diff --git a/Utilities/cmlibuv/src/win/util.c b/Utilities/cmlibuv/src/win/util.c +index aad8f1a1..a38e004c 100644 +--- a/Utilities/cmlibuv/src/win/util.c ++++ b/Utilities/cmlibuv/src/win/util.c +@@ -1917,6 +1917,10 @@ int uv_os_uname(uv_utsname_t* buffer) { + case PROCESSOR_ARCHITECTURE_MIPS: + uv__strscpy(buffer->machine, "mips", sizeof(buffer->machine)); + break; ++ case PROCESSOR_ARCHITECTURE_SW_64: ++ case PROCESSOR_ARCHITECTURE_SW_6464: ++ uv__strscpy(buffer->machine, "sw_64", sizeof(buffer->machine)); ++ break; + case PROCESSOR_ARCHITECTURE_ALPHA: + case PROCESSOR_ARCHITECTURE_ALPHA64: + uv__strscpy(buffer->machine, "alpha", sizeof(buffer->machine)); +-- +2.31.1 + diff --git a/cmake.spec b/cmake.spec index a72edcb0478ec2345c36364dded55fc1c3dfc43a..60750e62cd93e73978a7af63acc5d4705abfed22 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,3 +1,5 @@ +%define anolis_release .0.2 + # Do we add appdata-files? # consider conditional on whether %%_metainfodir is defined or not instead -- rex %if 0%{?fedora} || 0%{?rhel} > 7 @@ -73,7 +75,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.2 -Release: %{baserelease}%{?relsuf}%{?dist} +Release: %{baserelease}%{?relsuf}%{anolis_release}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -118,6 +120,11 @@ Patch105: 0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch Patch1: %{name}-rename.patch %endif +Patch106: cmake-add-sw.patch +%ifarch sw_64 +Patch107: cmake-SW-only-support-that-libraries-in-usr-lib.patch +%endif + BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc-c++ @@ -532,6 +539,12 @@ popd %changelog +* Wed Aug 30 2023 Weisson - 3.20.2-5.0.2 +- SW only support that libraries in /usr/lib. + +* Wed Jun 28 2023 wxiat - 3.20.2-5.0.1 +- add sw patch + * Tue Jan 31 2023 Tom Stellard - 3.20.2-5 - Fix test case broken by git fix for CVE-2022-39253