diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..c9a618551d7d788cde5f4326178966a3917277e9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..f42624258df61535915b04a5f4a7f79fae80e144 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/cmake diff --git a/cmake-3.27.9-fix-cxx-standard-check-issue.patch b/cmake-3.27.9-fix-cxx-standard-check-issue.patch deleted file mode 100644 index af9e6a6a5414038b605824cacebf74e6e59a7f57..0000000000000000000000000000000000000000 --- a/cmake-3.27.9-fix-cxx-standard-check-issue.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake -index 02627464..4f6ccdaf 100644 ---- a/Source/Checks/cm_cxx_features.cmake -+++ b/Source/Checks/cm_cxx_features.cmake -@@ -44,6 +44,8 @@ function(cm_check_cxx_feature name) - string(REGEX REPLACE "[^\n]*warning D[0-9][0-9][0-9][0-9][^\n]*" "" check_output "${check_output}") - # Filter out warnings caused by user flags. - string(REGEX REPLACE "[^\n]*warning:[^\n]*-Winvalid-command-line-argument[^\n]*" "" check_output "${check_output}") -+ # Filter out clang output warnings -+ string(REGEX REPLACE "[^\n]*warning:[^\n]*-Wunused-command-line-argument[^\n]*" "" check_output "${check_output}") - # Filter out warnings caused by local configuration. - string(REGEX REPLACE "[^\n]*warning:[^\n]*directory not found for option[^\n]*" "" check_output "${check_output}") - string(REGEX REPLACE "[^\n]*warning:[^\n]*object file compiled with -mlong-branch which is no longer needed[^\n]*" "" check_output "${check_output}") diff --git a/cmake-3.27.9.tar.gz b/cmake-3.27.9.tar.gz deleted file mode 100644 index 978f497df3b02535d63b093c9f6c8f3bcdf8f122..0000000000000000000000000000000000000000 Binary files a/cmake-3.27.9.tar.gz and /dev/null differ diff --git a/cmake-3.22.0-sw.patch b/cmake-3.31.6-sw.patch old mode 100755 new mode 100644 similarity index 39% rename from cmake-3.22.0-sw.patch rename to cmake-3.31.6-sw.patch index b2e7a2c6e99d2ffe4af47cca8172329cf84babae..3d68f48eee8fcde017d6875101f4f9ca79f1868d --- a/cmake-3.22.0-sw.patch +++ b/cmake-3.31.6-sw.patch @@ -1,16 +1,30 @@ -diff -Naur cmake-3.22.0.org/Modules/FindJNI.cmake cmake-3.22.0.sw/Modules/FindJNI.cmake ---- cmake-3.22.0.org/Modules/FindJNI.cmake 2022-02-25 01:21:55.530000000 +0000 -+++ cmake-3.22.0.sw/Modules/FindJNI.cmake 2022-02-25 01:30:19.530000000 +0000 -@@ -150,6 +150,8 @@ - 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") -@@ -509,6 +511,7 @@ +From 9b5ad2b0b4498b143c1fbc7b525ddef2faa90f05 Mon Sep 17 00:00:00 2001 +From: Funda Wang +Date: Thu, 20 Mar 2025 19:22:25 +0800 +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(-) + +diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake +index 82e3d88..02ae823 100644 +--- a/Modules/FindJNI.cmake ++++ b/Modules/FindJNI.cmake +@@ -150,6 +150,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") +@@ -512,6 +514,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 @@ -18,26 +32,24 @@ diff -Naur cmake-3.22.0.org/Modules/FindJNI.cmake cmake-3.22.0.sw/Modules/FindJN ${JAVA_INCLUDE_PATH}/aix DOC "jni_md.h jniport.h include directory" ) - -diff -Naur cmake-3.22.0.org/Modules/GNUInstallDirs.cmake cmake-3.22.0.sw/Modules/GNUInstallDirs.cmake ---- cmake-3.22.0.org/Modules/GNUInstallDirs.cmake 2022-02-25 01:21:55.550000000 +0000 -+++ cmake-3.22.0.sw/Modules/GNUInstallDirs.cmake 2022-02-25 01:32:38.270000000 +0000 -@@ -286,9 +286,9 @@ +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") -- set(_LIBDIR_DEFAULT "lib64") -+ set(_LIBDIR_DEFAULT "lib") +- 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") -+ set(__LAST_LIBDIR_DEFAULT "lib") - endif() - endif() - endif() -diff -Naur cmake-3.22.0.org/Utilities/KWIML/include/kwiml/abi.h cmake-3.22.0.sw/Utilities/KWIML/include/kwiml/abi.h ---- cmake-3.22.0.org/Utilities/KWIML/include/kwiml/abi.h 2022-02-25 01:21:57.660000000 +0000 -+++ cmake-3.22.0.sw/Utilities/KWIML/include/kwiml/abi.h 2022-02-25 01:25:45.020000000 +0000 -@@ -363,6 +363,10 @@ + 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 ++++ 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 @@ -48,22 +60,24 @@ diff -Naur cmake-3.22.0.org/Utilities/KWIML/include/kwiml/abi.h cmake-3.22.0.sw/ /* Alpha */ #elif defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA) # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE -diff -Naur cmake-3.22.0.org/Utilities/cmlibrhash/librhash/byte_order.h cmake-3.22.0.sw/Utilities/cmlibrhash/librhash/byte_order.h ---- cmake-3.22.0.org/Utilities/cmlibrhash/librhash/byte_order.h 2022-02-25 01:21:57.810000000 +0000 -+++ cmake-3.22.0.sw/Utilities/cmlibrhash/librhash/byte_order.h 2022-02-25 01:26:26.980000000 +0000 -@@ -75,7 +75,7 @@ +diff --git a/Utilities/cmlibrhash/librhash/byte_order.h b/Utilities/cmlibrhash/librhash/byte_order.h +index 73863e0..67e9343 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__) + defined(_ARM_) || defined(__arm__) || defined(_M_ARM64) || defined(_M_ARM64EC) || \ + defined(__loongarch64) # define RHASH_BYTE_ORDER RHASH_BYTE_ORDER_LE - #elif defined(__sparc) || defined(__sparc__) || defined(sparc) || \ -diff -Naur cmake-3.22.0.org/Utilities/cmlibuv/src/win/util.c cmake-3.22.0.sw/Utilities/cmlibuv/src/win/util.c ---- cmake-3.22.0.org/Utilities/cmlibuv/src/win/util.c 2022-02-25 01:21:57.830000000 +0000 -+++ cmake-3.22.0.sw/Utilities/cmlibuv/src/win/util.c 2022-02-25 01:33:21.970000000 +0000 -@@ -1849,6 +1849,10 @@ +diff --git a/Utilities/cmlibuv/src/win/util.c b/Utilities/cmlibuv/src/win/util.c +index 9943205..7cb1670 100644 +--- a/Utilities/cmlibuv/src/win/util.c ++++ b/Utilities/cmlibuv/src/win/util.c +@@ -1849,6 +1849,10 @@ int uv_os_uname(uv_utsname_t* buffer) { case PROCESSOR_ARCHITECTURE_MIPS: uv__strscpy(buffer->machine, "mips", sizeof(buffer->machine)); break; @@ -74,3 +88,6 @@ diff -Naur cmake-3.22.0.org/Utilities/cmlibuv/src/win/util.c cmake-3.22.0.sw/Uti case PROCESSOR_ARCHITECTURE_ALPHA: case PROCESSOR_ARCHITECTURE_ALPHA64: uv__strscpy(buffer->machine, "alpha", sizeof(buffer->machine)); +-- +2.43.5 + diff --git a/cmake-3.31.6.tar.gz b/cmake-3.31.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a724311967b92d4a5a99b3e230b6bc9bc6128ae6 --- /dev/null +++ b/cmake-3.31.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0 +size 11710589 diff --git a/cmake-findruby.patch b/cmake-findruby.patch index 72a8b258010a37de756bacc55502230ba7cc84d2..8a067528c60b38ba980c20ead4c01acad531d4c0 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,8 +1,8 @@ -Index: cmake-3.23.0-rc2/Modules/FindRuby.cmake +Index: cmake-3.31.4/Modules/FindRuby.cmake =================================================================== ---- cmake-3.23.0-rc2.orig/Modules/FindRuby.cmake -+++ cmake-3.23.0-rc2/Modules/FindRuby.cmake -@@ -315,14 +315,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_ +--- cmake-3.31.4.orig/Modules/FindRuby.cmake ++++ cmake-3.31.4/Modules/FindRuby.cmake +@@ -307,14 +307,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_ _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR) diff --git a/cmake.spec b/cmake.spec index 6ed93b963384c06f8eff79594c03a23d82cc812b..d13c41d70a5ddbe8bbceda9934a5925b5c713f19 100644 --- a/cmake.spec +++ b/cmake.spec @@ -19,26 +19,25 @@ %{?rcsuf:%global versuf -%{rcsuf}} Name: cmake -Version: 3.27.9 +Version: 3.31.6 %global major_version %(echo %{version} | awk -F. '{print $1}') -Release: 11 +Release: 1 Summary: Cross-platform make system License: BSD-3-Clause AND MIT-open-group AND Zlib -URL: http://www.cmake.org -Source0: https://www.cmake.org/files/v3.27/cmake-%{version}.tar.gz +URL: https://www.cmake.org +Source0: https://github.com/Kitware/CMake/releases/download/v%{version}/cmake-%{version}.tar.gz Source1: cmake-init.el Source2: macros.cmake.in Source3: cmake.attr Source4: cmake.prov Source5: cmake.req Patch0: cmake-findruby.patch -Patch1: cmake-3.27.9-fix-cxx-standard-check-issue.patch -Patch2: cmake-3.22.0-sw.patch +Patch1: cmake-3.31.6-sw.patch BuildRequires: coreutils findutils gcc-c++ gcc-gfortran sed %if %{with cmake_gui} -BuildRequires: pkgconfig(Qt5Widgets) desktop-file-utils +BuildRequires: pkgconfig(Qt6Widgets) desktop-file-utils %endif %if %{with emacs} @@ -126,12 +125,7 @@ BuildArch: noarch Documentation for cmake. %prep -%setup -n cmake-%{version}%{?versuf} -%patch 0 -p1 -%patch 1 -p1 -%ifarch sw_64 -%patch 2 -p1 -%endif +%autosetup -p1 -n cmake-%{version}%{?versuf} echo '#!%{__python3}' > %{name}.prov echo '#!%{__python3}' > %{name}.req @@ -308,6 +302,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Thu Mar 20 2025 Funda Wang - 3.31.6-1 +- update to version 3.31.6 + * Thu Mar 20 2025 Funda Wang - 3.27.9-11 - correctly produce cmake provides for qt6 packages