From 4ecb5dcab75c21629e35246789f0f48419ea5dfc Mon Sep 17 00:00:00 2001 From: Renbo Date: Tue, 30 Apr 2024 14:35:10 +0800 Subject: [PATCH 1/3] update to cmake-3.26.5-1.src.rpm Signed-off-by: Renbo --- ...-allow-usage-of-git-file-based-proto.patch | 41 ---------- cmake-3.20-CPACK_THREADS.patch | 11 --- ...ly-support-that-libraries-in-usr-lib.patch | 28 ------- cmake-add-sw.patch | 80 ------------------- cmake-mingw-dl.patch | 16 ---- cmake.spec | 43 ++++------ dist | 2 +- download | 2 +- 8 files changed, 18 insertions(+), 205 deletions(-) delete mode 100644 0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch delete mode 100644 cmake-3.20-CPACK_THREADS.patch delete mode 100644 cmake-SW-only-support-that-libraries-in-usr-lib.patch delete mode 100644 cmake-add-sw.patch delete mode 100644 cmake-mingw-dl.patch diff --git a/0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch b/0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch deleted file mode 100644 index 28f02b2..0000000 --- a/0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f72734ff7712d6aae837f940a45d6e7508bb182c Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Thu, 20 Oct 2022 13:38:20 -0400 -Subject: [PATCH] Tests: Explicitly allow usage of git file-based protocol in - test cases - -Due to CVE-2022-39253, Git 2.30.6 sets `protocol.file.allow=user` by -default. The change has also been backported to other Git versions by -distros. This breaks some of our test cases that use the file-based -protocol locally to simulate real workflows without requiring network -access. In these cases the file protocol is safe, so explicitly enable -it in the tests. - -(cherry picked from commit 79ce0f434e916684d734e136b92e14f472a9d14a) ---- - Tests/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt -index 8e7c04fbd0..d011020f99 100644 ---- a/Tests/CMakeLists.txt -+++ b/Tests/CMakeLists.txt -@@ -1540,6 +1540,7 @@ if(BUILD_TESTING) - ) - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ExternalProject") - set_tests_properties(ExternalProject PROPERTIES -+ ENVIRONMENT GIT_ALLOW_PROTOCOL=file - RUN_SERIAL 1 - TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT}) - -@@ -2653,6 +2654,7 @@ if(BUILD_TESTING) - -P "${CMake_BINARY_DIR}/Tests/CTestUpdateGIT.cmake" - ) - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateGIT_DIR}") -+ set_property(TEST CTest.UpdateGIT PROPERTY ENVIRONMENT GIT_ALLOW_PROTOCOL=file) - endif() - - # Test CTest Update with HG --- -2.31.1 - diff --git a/cmake-3.20-CPACK_THREADS.patch b/cmake-3.20-CPACK_THREADS.patch deleted file mode 100644 index 354f585..0000000 --- a/cmake-3.20-CPACK_THREADS.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up cmake-3.20.0/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake.CPACK_THREADS cmake-3.20.0/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake ---- cmake-3.20.0/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake.CPACK_THREADS 2021-03-23 10:43:17.000000000 -0500 -+++ cmake-3.20.0/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake 2021-03-23 13:29:14.539434722 -0500 -@@ -1,6 +1,6 @@ - install(FILES CMakeLists.txt DESTINATION foo COMPONENT test) - --set(CPACK_THREADS 0) -+set(CPACK_THREADS 4) - - if(PACKAGING_TYPE STREQUAL "COMPONENT") - set(CPACK_COMPONENTS_ALL test) 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-add-sw.patch b/cmake-add-sw.patch deleted file mode 100644 index db8a16a..0000000 --- a/cmake-add-sw.patch +++ /dev/null @@ -1,80 +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 -@@ -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-mingw-dl.patch b/cmake-mingw-dl.patch deleted file mode 100644 index dadbff4..0000000 --- a/cmake-mingw-dl.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur cmake-3.18.2.orig/Modules/Platform/Windows-GNU.cmake cmake-3.18.2/Modules/Platform/Windows-GNU.cmake ---- cmake-3.18.2.orig/Modules/Platform/Windows-GNU.cmake 2020-09-08 13:30:51.186087690 +0000 -+++ cmake-3.18.2/Modules/Platform/Windows-GNU.cmake 2020-09-10 07:42:22.458698539 +0000 -@@ -28,9 +28,11 @@ - set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib") - set(CMAKE_C_STANDARD_LIBRARIES_INIT "-lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32") - set(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}") -+ set(CMAKE_DL_LIBS "dl") -+else() -+ set(CMAKE_DL_LIBS "") - endif() - --set(CMAKE_DL_LIBS "") - set(CMAKE_LIBRARY_PATH_FLAG "-L") - set(CMAKE_LINK_LIBRARY_FLAG "-l") - set(CMAKE_LINK_DEF_FILE_FLAG "") # Empty string: passing the file is enough diff --git a/cmake.spec b/cmake.spec index 60750e6..5a485cc 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 @@ -60,22 +58,22 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 20 +%global minor_version 26 # Set to RC version if building RC, else %%{nil} #global rcsuf rc1 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 5 +%global baserelease 1 # Uncomment if building for EPEL #global name_suffix %%{major_version} %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.2 -Release: %{baserelease}%{?relsuf}%{anolis_release}%{?dist} +Version: %{major_version}.%{minor_version}.5 +Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -105,26 +103,12 @@ Patch100: %{name}-findruby.patch %if 0%{?fedora} && 0%{?fedora} < 34 Patch101: %{name}-fedora-flag_release.patch %endif -# Add dl to CMAKE_DL_LIBS on MINGW -# https://gitlab.kitware.com/cmake/cmake/issues/17600 -Patch102: %{name}-mingw-dl.patch -# memory-hungry tests when building on koji builders with *lots* of cores -# so limit it to some reasonable number (4) -Patch103: cmake-3.20-CPACK_THREADS.patch - -# rhbz#2162696 -Patch105: 0001-Tests-Explicitly-allow-usage-of-git-file-based-proto.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} 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++ @@ -216,6 +200,11 @@ Provides: bundled(md5-deutsch) # https://fedorahosted.org/fpc/ticket/555 Provides: bundled(kwsys) +# The license files are shipped in both the cmake and cmake-doc packages and +# can cause conflicts when updating. +# See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JDSG4K2S3IRCSZ37WCUGABY3JA45QMVA/#GEZTXMP5SXNMGAT3JPXDSQM5FPOLUJ5K +Conflicts: cmake-doc < %{version}-%{release} + %description CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates @@ -247,8 +236,10 @@ This package contains common data-files for %{name}. Summary: Documentation for %{name} BuildArch: noarch -# license files moved from the doc package to main package. -Conflicts: %{name} <= 3.20.1 +# The license files are shipped in both the cmake and cmake-doc packages and +# can cause conflicts when updating. +# See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JDSG4K2S3IRCSZ37WCUGABY3JA45QMVA/#GEZTXMP5SXNMGAT3JPXDSQM5FPOLUJ5K +Conflicts: %{name} < %{version}-%{release} %description doc This package contains documentation for %{name}. @@ -539,11 +530,9 @@ 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 +* Wed Nov 15 2023 Dominik Rehák - 3.26.5-1 +- Update to version 3.26.5 +- Fix conflict with license files. * 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 9c0e36e..37a6f9c 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8 +an8_9 diff --git a/download b/download index 9b1df3c..2f85aa0 100644 --- a/download +++ b/download @@ -1 +1 @@ -cd0e7735f1e51f30ee3b0844390a464a cmake-3.20.2.tar.gz +9ee1536202da1e803fbc71464825b9c2 cmake-3.26.5.tar.gz -- Gitee From 9f4d46f3ed8b0f0cd42e6037b701bc86b9a85f5f Mon Sep 17 00:00:00 2001 From: wxiat Date: Wed, 28 Jun 2023 17:23:11 +0800 Subject: [PATCH 2/3] 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 5a485cc..028c814 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 +* Tue Apr 30 2024 wxiat - 3.26.5-1.0.1 +- add sw patch + * Wed Nov 15 2023 Dominik Rehák - 3.26.5-1 - Update to version 3.26.5 - Fix conflict with license files. -- Gitee From c860941facac9e04eb7a74bc4b481a00653b93c7 Mon Sep 17 00:00:00 2001 From: Weisson Date: Wed, 30 Aug 2023 11:05:04 +0800 Subject: [PATCH 3/3] 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 028c814..e6aab89 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 * 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 -- Gitee