From 1d27f4e52932452ae3f4188322e57ab4d65f48e6 Mon Sep 17 00:00:00 2001 From: wxiat Date: Wed, 28 Jun 2023 17:23:11 +0800 Subject: [PATCH] add sw Signed-off-by: wxiat --- cmake-add-sw.patch | 80 ++++++++++++++++++++++++++++++++++++++++++++++ cmake.spec | 9 +++++- 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 cmake-add-sw.patch diff --git a/cmake-add-sw.patch b/cmake-add-sw.patch new file mode 100644 index 0000000..db8a16a --- /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 a72edcb..a9501b5 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,3 +1,5 @@ +%define anolis_release .0.1 + # 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,8 @@ Patch105: 0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch Patch1: %{name}-rename.patch %endif +Patch106: cmake-add-sw.patch + BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc-c++ @@ -532,6 +536,9 @@ popd %changelog +* 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 -- Gitee