diff --git a/cmake-3.19.2.tar.gz b/cmake-3.22.0.tar.gz similarity index 53% rename from cmake-3.19.2.tar.gz rename to cmake-3.22.0.tar.gz index 0d3b19083e523e7663f6da2ff818a1d1f72e4f9e..d8c49865165bd70a5a97fff6610647d471d25923 100644 Binary files a/cmake-3.19.2.tar.gz and b/cmake-3.22.0.tar.gz differ diff --git a/cmake-fedora-flag_release.patch b/cmake-fedora-flag_release.patch index 8a1e9729ab34430e8c087661867c17922738f2f1..737e184e4c527c6c736836244f788afa3660e58c 100644 --- a/cmake-fedora-flag_release.patch +++ b/cmake-fedora-flag_release.patch @@ -1,7 +1,7 @@ -Index: cmake-3.17.2/Modules/Compiler/Absoft-Fortran.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/Absoft-Fortran.cmake =================================================================== ---- cmake-3.17.2.orig/Modules/Compiler/Absoft-Fortran.cmake -+++ cmake-3.17.2/Modules/Compiler/Absoft-Fortran.cmake +--- cmake-3.22.0-rc1.orig/Modules/Compiler/Absoft-Fortran.cmake ++++ cmake-3.22.0-rc1/Modules/Compiler/Absoft-Fortran.cmake @@ -1,7 +1,7 @@ string(APPEND CMAKE_Fortran_FLAGS_INIT " ") string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") @@ -11,10 +11,10 @@ Index: cmake-3.17.2/Modules/Compiler/Absoft-Fortran.cmake string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") set(CMAKE_Fortran_MODDIR_FLAG "-YMOD_OUT_DIR=") set(CMAKE_Fortran_MODPATH_FLAG "-p") -Index: cmake-3.17.2/Modules/Compiler/G95-Fortran.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/G95-Fortran.cmake =================================================================== ---- cmake-3.17.2.orig/Modules/Compiler/G95-Fortran.cmake -+++ cmake-3.17.2/Modules/Compiler/G95-Fortran.cmake +--- cmake-3.22.0-rc1.orig/Modules/Compiler/G95-Fortran.cmake ++++ cmake-3.22.0-rc1/Modules/Compiler/G95-Fortran.cmake @@ -1,7 +1,7 @@ string(APPEND CMAKE_Fortran_FLAGS_INIT " ") string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") @@ -24,10 +24,10 @@ Index: cmake-3.17.2/Modules/Compiler/G95-Fortran.cmake string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") set(CMAKE_Fortran_MODDIR_FLAG "-fmod=") set(CMAKE_Fortran_VERBOSE_FLAG "-v") -Index: cmake-3.17.2/Modules/Compiler/GNU.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/GNU.cmake =================================================================== ---- cmake-3.17.2.orig/Modules/Compiler/GNU.cmake -+++ cmake-3.17.2/Modules/Compiler/GNU.cmake +--- cmake-3.22.0-rc1.orig/Modules/Compiler/GNU.cmake ++++ cmake-3.22.0-rc1/Modules/Compiler/GNU.cmake @@ -55,7 +55,7 @@ macro(__compiler_gnu lang) string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g") @@ -37,11 +37,11 @@ Index: cmake-3.17.2/Modules/Compiler/GNU.cmake string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE " -E > ") set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE " -S -o ") -Index: cmake-3.17.2/Modules/Compiler/GNU-Fortran.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/GNU-Fortran.cmake =================================================================== ---- cmake-3.17.2.orig/Modules/Compiler/GNU-Fortran.cmake -+++ cmake-3.17.2/Modules/Compiler/GNU-Fortran.cmake -@@ -14,7 +14,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpr +--- cmake-3.22.0-rc1.orig/Modules/Compiler/GNU-Fortran.cmake ++++ cmake-3.22.0-rc1/Modules/Compiler/GNU-Fortran.cmake +@@ -19,7 +19,7 @@ set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpr # No -DNDEBUG for Fortran. string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os") @@ -50,10 +50,10 @@ Index: cmake-3.17.2/Modules/Compiler/GNU-Fortran.cmake # No -isystem for Fortran because it will not find .mod files. unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran) -Index: cmake-3.17.2/Modules/Compiler/Intel.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/Intel.cmake =================================================================== ---- cmake-3.17.2.orig/Modules/Compiler/Intel.cmake -+++ cmake-3.17.2/Modules/Compiler/Intel.cmake +--- cmake-3.22.0-rc1.orig/Modules/Compiler/Intel.cmake ++++ cmake-3.22.0-rc1/Modules/Compiler/Intel.cmake @@ -22,7 +22,7 @@ else() string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g") @@ -63,11 +63,11 @@ Index: cmake-3.17.2/Modules/Compiler/Intel.cmake string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}") -Index: cmake-3.17.2/Modules/Compiler/NVIDIA-CUDA.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake =================================================================== ---- cmake-3.17.2.orig/Modules/Compiler/NVIDIA-CUDA.cmake -+++ cmake-3.17.2/Modules/Compiler/NVIDIA-CUDA.cmake -@@ -36,7 +36,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE +--- cmake-3.22.0-rc1.orig/Modules/Compiler/NVIDIA-CUDA.cmake ++++ cmake-3.22.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake +@@ -51,7 +51,7 @@ if(NOT "x${CMAKE_CUDA_SIMULATE_ID}" STRE set(CMAKE_SHARED_LIBRARY_CUDA_FLAGS -fPIC) string(APPEND CMAKE_CUDA_FLAGS_INIT " ") string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g") @@ -76,10 +76,10 @@ Index: cmake-3.17.2/Modules/Compiler/NVIDIA-CUDA.cmake string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG") string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") endif() -Index: cmake-3.17.2/Modules/Compiler/PathScale.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/PathScale.cmake =================================================================== ---- cmake-3.17.2.orig/Modules/Compiler/PathScale.cmake -+++ cmake-3.17.2/Modules/Compiler/PathScale.cmake +--- cmake-3.22.0-rc1.orig/Modules/Compiler/PathScale.cmake ++++ cmake-3.22.0-rc1/Modules/Compiler/PathScale.cmake @@ -16,6 +16,6 @@ macro(__compiler_pathscale lang) string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0") @@ -88,10 +88,10 @@ Index: cmake-3.17.2/Modules/Compiler/PathScale.cmake + string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2") string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2") endmacro() -Index: cmake-3.17.2/Modules/Compiler/PGI.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/PGI.cmake =================================================================== ---- cmake-3.17.2.orig/Modules/Compiler/PGI.cmake -+++ cmake-3.17.2/Modules/Compiler/PGI.cmake +--- cmake-3.22.0-rc1.orig/Modules/Compiler/PGI.cmake ++++ cmake-3.22.0-rc1/Modules/Compiler/PGI.cmake @@ -18,7 +18,7 @@ macro(__compiler_pgi lang) string(APPEND CMAKE_${lang}_FLAGS_INIT " ") string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -O0") @@ -101,63 +101,11 @@ Index: cmake-3.17.2/Modules/Compiler/PGI.cmake string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt") if(CMAKE_HOST_WIN32) -Index: cmake-3.17.2/Modules/Compiler/SunPro-ASM.cmake +Index: cmake-3.22.0-rc1/Modules/Platform/Windows-Clang.cmake =================================================================== ---- cmake-3.17.2.orig/Modules/Compiler/SunPro-ASM.cmake -+++ cmake-3.17.2/Modules/Compiler/SunPro-ASM.cmake -@@ -11,7 +11,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_ASM_FLAG - string(APPEND CMAKE_ASM_FLAGS_INIT " ") - string(APPEND CMAKE_ASM_FLAGS_DEBUG_INIT " -g") - string(APPEND CMAKE_ASM_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG") --string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG") -+string(APPEND CMAKE_ASM_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG") - string(APPEND CMAKE_ASM_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") - - # Initialize ASM link type selection flags. These flags are used when -Index: cmake-3.17.2/Modules/Compiler/SunPro-C.cmake -=================================================================== ---- cmake-3.17.2.orig/Modules/Compiler/SunPro-C.cmake -+++ cmake-3.17.2/Modules/Compiler/SunPro-C.cmake -@@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG " - string(APPEND CMAKE_C_FLAGS_INIT " ") - string(APPEND CMAKE_C_FLAGS_DEBUG_INIT " -g") - string(APPEND CMAKE_C_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG") --string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG") -+string(APPEND CMAKE_C_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG") - string(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") - - set(CMAKE_DEPFILE_FLAGS_C "-xMD -xMF ") -Index: cmake-3.17.2/Modules/Compiler/SunPro-CXX.cmake -=================================================================== ---- cmake-3.17.2.orig/Modules/Compiler/SunPro-CXX.cmake -+++ cmake-3.17.2/Modules/Compiler/SunPro-CXX.cmake -@@ -19,7 +19,7 @@ set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG - string(APPEND CMAKE_CXX_FLAGS_INIT " ") - string(APPEND CMAKE_CXX_FLAGS_DEBUG_INIT " -g") - string(APPEND CMAKE_CXX_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG") --string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG") -+string(APPEND CMAKE_CXX_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG") - string(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") - - set(CMAKE_DEPFILE_FLAGS_CXX "-xMD -xMF ") -Index: cmake-3.17.2/Modules/Compiler/SunPro-Fortran.cmake -=================================================================== ---- cmake-3.17.2.orig/Modules/Compiler/SunPro-Fortran.cmake -+++ cmake-3.17.2/Modules/Compiler/SunPro-Fortran.cmake -@@ -17,7 +17,7 @@ set(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLA - string(APPEND CMAKE_Fortran_FLAGS_INIT " ") - string(APPEND CMAKE_Fortran_FLAGS_DEBUG_INIT " -g") - string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -xO2 -xspace -DNDEBUG") --string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -xO3 -DNDEBUG") -+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -xO2 -DNDEBUG") - string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -g -xO2 -DNDEBUG") - set(CMAKE_Fortran_MODDIR_FLAG "-moddir=") - set(CMAKE_Fortran_MODPATH_FLAG "-M") -Index: cmake-3.17.2/Modules/Platform/Windows-Clang.cmake -=================================================================== ---- cmake-3.17.2.orig/Modules/Platform/Windows-Clang.cmake -+++ cmake-3.17.2/Modules/Platform/Windows-Clang.cmake -@@ -79,7 +79,7 @@ macro(__windows_compiler_clang_gnu lang) +--- cmake-3.22.0-rc1.orig/Modules/Platform/Windows-Clang.cmake ++++ cmake-3.22.0-rc1/Modules/Platform/Windows-Clang.cmake +@@ -92,7 +92,7 @@ macro(__windows_compiler_clang_gnu lang) string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g -Xclang -gcodeview -O0 ${__ADDED_FLAGS_DEBUG}") string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG ${__ADDED_FLAGS}") @@ -166,3 +114,4 @@ Index: cmake-3.17.2/Modules/Platform/Windows-Clang.cmake string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG -Xclang -gcodeview ${__ADDED_FLAGS}") endif() set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ") + diff --git a/cmake-findruby.patch b/cmake-findruby.patch index ee9eafbd1131bdf9e042e63c1e947040a79fb6f9..23966a22421f334e24373a1e43c920b3aaf40e92 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,8 +1,8 @@ -Index: cmake-3.17.2/Modules/FindRuby.cmake +Index: cmake-3.22.0-rc1/Modules/FindRuby.cmake =================================================================== ---- cmake-3.17.2.orig/Modules/FindRuby.cmake -+++ cmake-3.17.2/Modules/FindRuby.cmake -@@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO +--- cmake-3.22.0-rc1.orig/Modules/FindRuby.cmake ++++ cmake-3.22.0-rc1/Modules/FindRuby.cmake +@@ -304,14 +304,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_ _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR) @@ -14,6 +14,7 @@ Index: cmake-3.17.2/Modules/FindRuby.cmake - _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) - _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) - endif() ++ # vendor_ruby + _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) + _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) diff --git a/cmake-mingw-dl.patch b/cmake-mingw-dl.patch index cff7cb15a06f47692297648d46994f1337118e05..ca1f52a9b98a449b975ae74751c7efbab5f33e02 100644 --- a/cmake-mingw-dl.patch +++ b/cmake-mingw-dl.patch @@ -1,21 +1,19 @@ -Index: cmake-3.17.2/Modules/Platform/Windows-GNU.cmake +Index: cmake-3.22.0-rc1/Modules/Platform/Windows-GNU.cmake =================================================================== ---- cmake-3.17.2.orig/Modules/Platform/Windows-GNU.cmake -+++ cmake-3.17.2/Modules/Platform/Windows-GNU.cmake -@@ -25,12 +25,14 @@ endif() +--- cmake-3.22.0-rc1.orig/Modules/Platform/Windows-GNU.cmake ++++ cmake-3.22.0-rc1/Modules/Platform/Windows-GNU.cmake +@@ -24,11 +24,11 @@ set(CMAKE_STATIC_LIBRARY_SUFFIX ".a") + set(CMAKE_EXTRA_LINK_EXTENSIONS ".lib") # MinGW can also link to a MS .lib - if(MINGW) - set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "") -- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib") -+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".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_FIND_LIBRARY_PREFIXES "lib" "") +-set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a" ".lib") ++set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll" ".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 "") ++set(CMAKE_DL_LIBS "dl") 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 03973515160e0086d2c113a4c98f8683db8fb983..19e40debd51cc04cfa216e8af658816e7515fa64 100644 --- a/cmake.spec +++ b/cmake.spec @@ -10,12 +10,12 @@ %{?rcsuf:%global versuf -%{rcsuf}} Name: cmake -Version: 3.19.2 -Release: 3 +Version: 3.22.0 +Release: 1 Summary: Cross-platform make system License: BSD and MIT and zlib URL: http://www.cmake.org -Source0: https://www.cmake.org/files/v3.19/cmake-%{version}.tar.gz +Source0: https://www.cmake.org/files/v3.22/cmake-%{version}.tar.gz Source1: cmake-init.el Source2: macros.cmake Source3: cmake.attr @@ -234,6 +234,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %exclude %{_pkgdocdir}/Copyright.txt %changelog +* Sat Feb 12 2022 wangchen - 3.22.0-1 +- Update to 3.22.0 + * Tue Jul 20 2021 wangchen - 3.19.2-3 - Delete unnecessary gdb from BuildRequires