From 2359ffe7c5a4835d9e3f65a7fd0f8341ed2035e4 Mon Sep 17 00:00:00 2001 From: Renbo Date: Thu, 18 Jul 2024 11:33:04 +0800 Subject: [PATCH 1/4] update to cmake-3.26.5-2.src.rpm Signed-off-by: Renbo --- cmake-add-sw.patch | 71 ---------------------------------------------- cmake.spec | 21 ++++---------- dist | 2 +- 3 files changed, 7 insertions(+), 87 deletions(-) delete mode 100644 cmake-add-sw.patch diff --git a/cmake-add-sw.patch b/cmake-add-sw.patch deleted file mode 100644 index 81996a7..0000000 --- a/cmake-add-sw.patch +++ /dev/null @@ -1,71 +0,0 @@ -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 -@@ -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 - DOC "jni_md.h jniport.h include directory" - ) -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 9e9273e..c39df97 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,5 +1,3 @@ -%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 @@ -67,7 +65,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -75,7 +73,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.5 -Release: %{baserelease}%{?relsuf}%{anolis_release}%{?dist} +Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -111,8 +109,6 @@ Patch101: %{name}-fedora-flag_release.patch Patch1: %{name}-rename.patch %endif -Patch106: cmake-add-sw.patch - BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc-c++ @@ -296,9 +292,6 @@ tail -n +2 %{SOURCE4} >> %{name}.prov tail -n +2 %{SOURCE5} >> %{name}.req %endif -%ifarch sw_64 -sed -i 's/_LIBDIR_DEFAULT \"lib64\"/_LIBDIR_DEFAULT \"lib\"/g' Modules/GNUInstallDirs.cmake -%endif %build %if 0%{?set_build_flags:1} @@ -537,14 +530,12 @@ popd %changelog -* Tue Apr 30 2024 wxiat - 3.26.5-1.0.1 -- add sw patch -- SW only support that libraries in /usr/lib. (Weisson@linux.alibaba.com) - -* Wed Nov 15 2023 Dominik Rehák - 3.26.5-1 -- Update to version 3.26.5 +* Fri Nov 03 2023 Tom Stellard - 3.26.5-2 - Fix conflict with license files. +* Thu Oct 26 2023 Tom Stellard - 3.26.5-1 +- Update to version 3.26.5-1 + * Tue Jan 31 2023 Tom Stellard - 3.20.2-5 - Fix test case broken by git fix for CVE-2022-39253 diff --git a/dist b/dist index 37a6f9c..9c0e36e 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8_9 +an8 -- Gitee From a92f85708924e289c460cb5f1914c4deadb97755 Mon Sep 17 00:00:00 2001 From: wxiat Date: Wed, 28 Jun 2023 17:23:11 +0800 Subject: [PATCH 2/4] add sw Signed-off-by: wxiat --- cmake-add-sw.patch | 71 ++++++++++++++++++++++++++++++++++++++++++++++ cmake.spec | 9 +++++- 2 files changed, 79 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..81996a7 --- /dev/null +++ b/cmake-add-sw.patch @@ -0,0 +1,71 @@ +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 +@@ -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 + DOC "jni_md.h jniport.h include directory" + ) +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 c39df97..248b2c7 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}.5 -Release: %{baserelease}%{?relsuf}%{?dist} +Release: %{baserelease}%{?relsuf}%{anolis_release}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -109,6 +111,8 @@ Patch101: %{name}-fedora-flag_release.patch Patch1: %{name}-rename.patch %endif +Patch106: cmake-add-sw.patch + BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc-c++ @@ -530,6 +534,9 @@ popd %changelog +* Thu Jul 18 2024 wxiat - 3.26.5-2.0.1 +- add sw patch + * Fri Nov 03 2023 Tom Stellard - 3.26.5-2 - Fix conflict with license files. -- Gitee From 0f5ee0306e6aa9e5cbae68c4a51af14477a7278b Mon Sep 17 00:00:00 2001 From: Weisson Date: Wed, 30 Aug 2023 11:05:04 +0800 Subject: [PATCH 3/4] SW only support that libraries in /usr/lib. Signed-off-by: Weisson --- ...ly-support-that-libraries-in-usr-lib.patch | 28 +++++++++++++++++++ cmake.spec | 6 +++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 cmake-SW-only-support-that-libraries-in-usr-lib.patch 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 0000000..c5f5b1e --- /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.spec b/cmake.spec index 248b2c7..5a088a7 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 # Do we add appdata-files? # consider conditional on whether %%_metainfodir is defined or not instead -- rex @@ -112,6 +112,9 @@ 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 @@ -536,6 +539,7 @@ popd %changelog * Thu Jul 18 2024 wxiat - 3.26.5-2.0.1 - add sw patch +- SW only support that libraries in /usr/lib. (Weisson@linux.alibaba.com) * Fri Nov 03 2023 Tom Stellard - 3.26.5-2 - Fix conflict with license files. -- Gitee From c8c87dc060b04bcfafee2957a804d2655126be6f Mon Sep 17 00:00:00 2001 From: Weisson Date: Mon, 24 Jun 2024 16:23:37 +0800 Subject: [PATCH 4/4] sw_64 only supports that libraries in /usr/lib. Signed-off-by: Weisson --- ...ly-support-that-libraries-in-usr-lib.patch | 28 ------------------- cmake.spec | 6 ++-- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 cmake-SW-only-support-that-libraries-in-usr-lib.patch diff --git a/cmake-SW-only-support-that-libraries-in-usr-lib.patch b/cmake-SW-only-support-that-libraries-in-usr-lib.patch deleted file mode 100644 index c5f5b1e..0000000 --- a/cmake-SW-only-support-that-libraries-in-usr-lib.patch +++ /dev/null @@ -1,28 +0,0 @@ -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.spec b/cmake.spec index 5a088a7..1943420 100644 --- a/cmake.spec +++ b/cmake.spec @@ -112,9 +112,6 @@ 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 @@ -299,6 +296,9 @@ tail -n +2 %{SOURCE4} >> %{name}.prov tail -n +2 %{SOURCE5} >> %{name}.req %endif +%ifarch sw_64 +sed -i 's/_LIBDIR_DEFAULT \"lib64\"/_LIBDIR_DEFAULT \"lib\"/g' Modules/GNUInstallDirs.cmake +%endif %build %if 0%{?set_build_flags:1} -- Gitee