From 7aedef19ddf03cd7f7057612d0588c4ee1bb05c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 30 May 2020 11:45:29 +0200 Subject: [PATCH 001/238] Bootstrap for Rebuild (jsoncpp) --- cmake.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 23cb7c2..7c26db2 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture -%bcond_with bootstrap +%bcond_without bootstrap # Build with Emacs support %bcond_without emacs @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.3 -Release: 1%{?relsuf}%{?dist} +Release: 2%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -493,6 +493,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Sat May 30 2020 Björn Esser - 3.17.3-2 +- Rebuild (jsoncpp) + * Fri May 29 2020 Björn Esser - 3.17.3-1 - Update to cmake-3.17.3 From f076d38e5eae1ab12b62e8cd590c22820481b4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 30 May 2020 12:00:55 +0200 Subject: [PATCH 002/238] Disable bootstrap for Rebuild (jsoncpp) --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 7c26db2..9c5fff7 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture -%bcond_without bootstrap +%bcond_with bootstrap # Build with Emacs support %bcond_without emacs From d0248a96bf744bf8c5376a9a2805f4872da77382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 30 May 2020 13:47:58 +0200 Subject: [PATCH 003/238] Revert "Disable bootstrap for Rebuild (jsoncpp)" This reverts commit f076d38e5eae1ab12b62e8cd590c22820481b4d9. --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 9c5fff7..7c26db2 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture -%bcond_with bootstrap +%bcond_without bootstrap # Build with Emacs support %bcond_without emacs From 01c03f182ccdec79563b7a457a74dc6122a8377a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 30 May 2020 13:49:02 +0200 Subject: [PATCH 004/238] Disable curl test --- cmake.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 7c26db2..6af9be9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -414,9 +414,9 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \ mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled %endif pushd %{_vpath_builddir} -# CTestTestUpload require internet access +# CTestTestUpload, curl require internet access # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983 -NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup" +NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup|curl" # kwsys.testProcess-{4,5} are flaky on s390x. %ifarch s390x NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" From cfff94149b6b12bacc690ae8ed46235ab10d62dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 30 May 2020 13:52:15 +0200 Subject: [PATCH 005/238] Disable bootstrap for Rebuild (jsoncpp) --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 6af9be9..201eb90 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture -%bcond_without bootstrap +%bcond_with bootstrap # Build with Emacs support %bcond_without emacs From 645a99bedd6effe2f4a51f57978cf61ad51b3ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 30 May 2020 14:19:55 +0200 Subject: [PATCH 006/238] Disable curl test during bootstrap only --- cmake.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 201eb90..7aaa1c3 100644 --- a/cmake.spec +++ b/cmake.spec @@ -414,13 +414,17 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \ mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled %endif pushd %{_vpath_builddir} -# CTestTestUpload, curl require internet access +# CTestTestUpload require internet access # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983 -NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup|curl" +NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup" # kwsys.testProcess-{4,5} are flaky on s390x. %ifarch s390x NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" %endif +# curl test may fail during bootstrap +%if %{with bootstrap} +NO_TEST="$NO_TEST|curl" +%endif bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure # Keep an eye on failing tests bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || : From aa9db08f964a227f03d404dffa3f33c97dd25a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 12 Jun 2020 18:12:36 +0200 Subject: [PATCH 007/238] Refresh FindRuby patch --- cmake-findruby.patch | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/cmake-findruby.patch b/cmake-findruby.patch index b5d4fae..50e6a6e 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,21 +1,22 @@ -Index: cmake-3.17.0-rc1/Modules/FindRuby.cmake +Index: cmake-3.18.0-rc1/Modules/FindRuby.cmake =================================================================== ---- cmake-3.17.0-rc1.orig/Modules/FindRuby.cmake -+++ cmake-3.17.0-rc1/Modules/FindRuby.cmake -@@ -110,14 +110,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO - _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) - _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) +--- cmake-3.18.0-rc1.orig/Modules/FindRuby.cmake ++++ cmake-3.18.0-rc1/Modules/FindRuby.cmake +@@ -289,14 +289,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_ + _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR) + _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR) - # vendor_ruby available ? -- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" -- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) +- execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'" +- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET) - -- if(RUBY_HAS_VENDOR_RUBY) -- _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) -- _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) +- if(Ruby_HAS_VENDOR_RUBY) +- _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) +- _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) - endif() -+ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) -+ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) ++ # vendor_ruby ++ _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) ++ _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) # save the results in the cache so we don't have to run ruby the next time again - set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) + set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) From 8b4138a684dbe5afe63a17b5301a854c4824a0b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 12 Jun 2020 18:14:59 +0200 Subject: [PATCH 008/238] Update to 3.18.0-rc1 --- cmake.spec | 22 +++++++++++++++------- sources | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/cmake.spec b/cmake.spec index 7aaa1c3..49648c9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -55,9 +55,9 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 17 +%global minor_version 18 # Set to RC version if building RC, else %%{nil} -#global rcsuf rc3 +%global rcsuf rc1 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} @@ -66,8 +66,8 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.3 -Release: 2%{?relsuf}%{?dist} +Version: %{major_version}.%{minor_version}.0 +Release: 0.1%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -142,6 +142,7 @@ BuildRequires: libuv-devel BuildRequires: rhash-devel BuildRequires: xz-devel BuildRequires: zlib-devel +BuildRequires: vim-filesystem %endif %if %{with emacs} BuildRequires: emacs @@ -203,6 +204,7 @@ Requires: %{name}-rpm-macros = %{version}-%{release} Requires: emacs-filesystem%{?_emacs_version: >= %{_emacs_version}} %endif %endif +Requires: vim-filesystem BuildArch: noarch @@ -311,11 +313,12 @@ do done %if %{with emacs} # Install emacs cmake mode -mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name} -install -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name}/%{name}-mode.el +mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name} %{buildroot}%{_emacs_sitestartdir} +mv %{buildroot}%{_emacs_sitelispdir}/%{name}-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name} %{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/%{name}/%{name}-mode.el -mkdir -p %{buildroot}%{_emacs_sitestartdir} install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} +%else +rm -f %{buildroot}%{_emacs_sitelispdir} %endif # RPM macros install -p -m0644 -D %{SOURCE2} %{buildroot}%{rpm_macros_dir}/macros.%{name} @@ -460,6 +463,8 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %{_emacs_sitestartdir} %endif %endif +%{vimfiles_root}/indent/%{name}.vim +%{vimfiles_root}/syntax/%{name}.vim %files doc @@ -497,6 +502,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Fri Jun 12 2020 Björn Esser - 3.18.0-0.1.rc1 +- Update to 3.18.0-rc1 + * Sat May 30 2020 Björn Esser - 3.17.3-2 - Rebuild (jsoncpp) diff --git a/sources b/sources index 626b891..0d09d72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.17.3.tar.gz) = 13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69 +SHA512 (cmake-3.18.0-rc1.tar.gz) = d660edf0e15796671662c6665d4d9bc621fe31e940dd976e59404aa5b5c71fe782057b63c45615b6a624d5b36508982c5ecfd03ed84fbb27b0084d45d76360d5 From 77c5d42f75e01521d0ab501d3916d29e7ca0df29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 20 Jun 2020 11:37:49 +0200 Subject: [PATCH 009/238] Update to 3.18.0-rc2 --- cmake.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 49648c9..c73fef2 100644 --- a/cmake.spec +++ b/cmake.spec @@ -57,7 +57,7 @@ %global major_version 3 %global minor_version 18 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc1 +%global rcsuf rc2 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.1%{?relsuf}%{?dist} +Release: 0.2%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -502,6 +502,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Sat Jun 20 2020 Björn Esser - 3.18.0-0.2.rc2 +- Update to 3.18.0-rc2 + * Fri Jun 12 2020 Björn Esser - 3.18.0-0.1.rc1 - Update to 3.18.0-rc1 diff --git a/sources b/sources index 0d09d72..a145c0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.18.0-rc1.tar.gz) = d660edf0e15796671662c6665d4d9bc621fe31e940dd976e59404aa5b5c71fe782057b63c45615b6a624d5b36508982c5ecfd03ed84fbb27b0084d45d76360d5 +SHA512 (cmake-3.18.0-rc2.tar.gz) = 30f6a223151bbfd9d18c39d5236a7d420e4a526fa88f7254dfffe3dd456b2e6efe66ab206b4c9a9ac758ab4d1cb89a2484c52d90f9d7658a8093f6ee2dc90632 From 50646f0efa5e59215a2d7b90902c84272749c59b Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 9 May 2020 14:29:06 -0400 Subject: [PATCH 010/238] Setup CMake to do out-of-tree builds by default This brings CMake in line with upstream best practices for building with CMake and lines up with how most people expect CMake to behave. --- macros.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/macros.cmake b/macros.cmake index ebfebee..9ffec75 100644 --- a/macros.cmake +++ b/macros.cmake @@ -24,6 +24,8 @@ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ %endif \ %__cmake \\\ + -S "%{_vpath_srcdir}" \\\ + -B "%{_vpath_builddir}" \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ From 4e79ea67732aecb6232c33dfff6ab033842cf840 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 9 May 2020 14:30:33 -0400 Subject: [PATCH 011/238] Add build, install, and test macros for CMake CMake supports multiple generator types for builds, such as GNU Make and Ninja. As of CMake 3.15, there are now analogs for build and install steps typically managed directly by build tools, where CMake controls the logic to correctly call out. Consequently, it is now rather easy to support any given type of build tool (as long as it's available in the build environment) and have a CMake build "work" as expected. This also brings CMake in line with the same build/install process that is used for packaging Meson-based projects. --- macros.cmake | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/macros.cmake b/macros.cmake index 9ffec75..b33142b 100644 --- a/macros.cmake +++ b/macros.cmake @@ -6,6 +6,7 @@ %_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON %_cmake_version @@CMAKE_VERSION@@ %__cmake /usr/bin/cmake +%__ctest /usr/bin/ctest # - Set default compile flags # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables @@ -40,4 +41,19 @@ %endif \ %{?_cmake_shared_libs} +%cmake_build \ + %__cmake --build "%{_vpath_builddir}" %{?_smp_mflags} --verbose + +%cmake_install \ + DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}" + +%ctest(:-:) \ + cd "%{_vpath_builddir}" \ + %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \ + cd - + + %cmake@@CMAKE_MAJOR_VERSION@@ %cmake +%cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build +%cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install +%ctest@@CMAKE_MAJOR_VERSION@@ %ctest From a86fd237d42ae449ca8cc622e50909638aaef515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 29 Jun 2020 19:42:03 +0200 Subject: [PATCH 012/238] Apply change: CMake to do out-of-source builds (#1852036) --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index c73fef2..c550088 100644 --- a/cmake.spec +++ b/cmake.spec @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.2%{?relsuf}%{?dist} +Release: 0.3%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -502,6 +502,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Mon Jun 29 2020 Björn Esser - 3.18.0-0.3.rc2 +- Apply change: CMake to do out-of-source builds (#1852036) + * Sat Jun 20 2020 Björn Esser - 3.18.0-0.2.rc2 - Update to 3.18.0-rc2 From a63a3e2b710a6df0ebc1954f9695c4aac3e45b00 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 30 Jun 2020 15:37:16 -0400 Subject: [PATCH 013/238] fix FindLua to support lua 5.4 --- cmake-3.18.0-rc2-lua-5.4.patch | 63 ++++++++++++++++++++++++++++++++++ cmake.spec | 8 +++-- 2 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 cmake-3.18.0-rc2-lua-5.4.patch diff --git a/cmake-3.18.0-rc2-lua-5.4.patch b/cmake-3.18.0-rc2-lua-5.4.patch new file mode 100644 index 0000000..f13d30d --- /dev/null +++ b/cmake-3.18.0-rc2-lua-5.4.patch @@ -0,0 +1,63 @@ +diff -up cmake-3.18.0-rc2/Modules/FindLua.cmake.lua54 cmake-3.18.0-rc2/Modules/FindLua.cmake +--- cmake-3.18.0-rc2/Modules/FindLua.cmake.lua54 2020-06-30 14:17:05.897460893 -0400 ++++ cmake-3.18.0-rc2/Modules/FindLua.cmake 2020-06-30 14:17:16.173293679 -0400 +@@ -48,7 +48,7 @@ unset(_lua_append_versions) + + # this is a function only to have all the variables inside go away automatically + function(_lua_get_versions) +- set(LUA_VERSIONS5 5.3 5.2 5.1 5.0) ++ set(LUA_VERSIONS5 5.4 5.3 5.2 5.1 5.0) + + if (Lua_FIND_VERSION_EXACT) + if (Lua_FIND_VERSION_COUNT GREATER 1) +diff -up cmake-3.18.0-rc2/Tests/RunCMake/FindLua/FindLuaTest.cmake.lua54 cmake-3.18.0-rc2/Tests/RunCMake/FindLua/FindLuaTest.cmake +--- cmake-3.18.0-rc2/Tests/RunCMake/FindLua/FindLuaTest.cmake.lua54 2020-06-30 14:17:44.756828608 -0400 ++++ cmake-3.18.0-rc2/Tests/RunCMake/FindLua/FindLuaTest.cmake 2020-06-30 14:18:20.411248461 -0400 +@@ -59,15 +59,15 @@ function(test_path prefix_path lua_path + endfunction() + + # Simple test +-test_path(prefix1 prefix1/include 5.3) ++test_path(prefix1 prefix1/include 5.4) + # Find highest version +-test_path(prefix2 prefix2/include/lua5.3 5.3) +-foreach(ver 5.3 5.2 5.1) ++test_path(prefix2 prefix2/include/lua5.4 5.4) ++foreach(ver 5.4 5.3 5.2 5.1) + # At least X or X.0 -> Highest + set(VERSION "${ver}") +- test_path(prefix2 prefix2/include/lua5.3 5.3) ++ test_path(prefix2 prefix2/include/lua5.4 5.4) + set(VERSION "${ver}.0") +- test_path(prefix2 prefix2/include/lua5.3 5.3) ++ test_path(prefix2 prefix2/include/lua5.4 5.4) + # Exactly X/X.0 + set(VERSION "${ver}" EXACT) + test_path(prefix2 prefix2/include/lua${ver} ${ver}) +diff -up cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix2/include/lua5.4/lua.h.lua54 cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix2/include/lua5.4/lua.h +--- cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix2/include/lua5.4/lua.h.lua54 2020-06-30 14:19:19.646284675 -0400 ++++ cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix2/include/lua5.4/lua.h 2020-06-30 14:19:11.988409288 -0400 +@@ -0,0 +1,8 @@ ++ ++#define LUA_VERSION_MAJOR "5" ++#define LUA_VERSION_MINOR "4" ++#define LUA_VERSION_NUM 504 ++#define LUA_VERSION_RELEASE "0" ++ ++#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR ++#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE +diff -up cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix1/include/lua.h.lua54 cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix1/include/lua.h +--- cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix1/include/lua.h.lua54 2020-06-30 15:05:35.332154492 -0400 ++++ cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix1/include/lua.h 2020-06-30 15:05:51.201899127 -0400 +@@ -1,8 +1,8 @@ + + #define LUA_VERSION_MAJOR "5" +-#define LUA_VERSION_MINOR "3" +-#define LUA_VERSION_NUM 503 +-#define LUA_VERSION_RELEASE "4" ++#define LUA_VERSION_MINOR "4" ++#define LUA_VERSION_NUM 504 ++#define LUA_VERSION_RELEASE "0" + + #define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR + #define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE diff --git a/cmake.spec b/cmake.spec index c550088..8eb384d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.3%{?relsuf}%{?dist} +Release: 0.4%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -98,7 +98,8 @@ Patch101: %{name}-fedora-flag_release.patch # Add dl to CMAKE_DL_LIBS on MINGW # https://gitlab.kitware.com/cmake/cmake/issues/17600 Patch102: %{name}-mingw-dl.patch - +# Fix FindLua to support Lua 5.4 +Patch103: %{name}-3.18.0-rc2-lua-5.4.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -502,6 +503,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Tue Jun 30 2020 Tom Callaway - 3.18.0-0.4.rc2 +- fix FindLua to support lua 5.4 + * Mon Jun 29 2020 Björn Esser - 3.18.0-0.3.rc2 - Apply change: CMake to do out-of-source builds (#1852036) From 134e994816b2061ecbdf2c39ae61568f76551dd0 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Wed, 1 Jul 2020 08:26:46 +0200 Subject: [PATCH 014/238] Revert "Setup CMake to do out-of-tree builds by default" This reverts commit 50646f0efa5e59215a2d7b90902c84272749c59b. Signed-off-by: Igor Raits --- cmake.spec | 5 ++++- macros.cmake | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 8eb384d..264d11c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.4%{?relsuf}%{?dist} +Release: 0.5%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -503,6 +503,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Wed Jul 01 2020 Igor Raits - 3.18.0-0.5.rc2 +- Undo out-of-source-builds + * Tue Jun 30 2020 Tom Callaway - 3.18.0-0.4.rc2 - fix FindLua to support lua 5.4 diff --git a/macros.cmake b/macros.cmake index b33142b..0bf1119 100644 --- a/macros.cmake +++ b/macros.cmake @@ -25,8 +25,6 @@ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ %endif \ %__cmake \\\ - -S "%{_vpath_srcdir}" \\\ - -B "%{_vpath_builddir}" \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ From 2af1671e51f9be897601fad28b1e28e226fbe5ac Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Fri, 3 Jul 2020 17:12:56 +0200 Subject: [PATCH 015/238] Add out-of-source builds controlled by a macro This will allow us to port packages to the %cmake_build/%cmake_install even on older Fedora with possibility to easily opt-in for out-of-source builds by `%global __cmake_out_of_source_build 1`. In future we will make it opt-out (`%global __cmake_out_of_source_build 0` will do in-source builds again). Signed-off-by: Igor Raits --- cmake.spec | 5 ++++- macros.cmake | 12 ++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/cmake.spec b/cmake.spec index 264d11c..8fcaa99 100644 --- a/cmake.spec +++ b/cmake.spec @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.5%{?relsuf}%{?dist} +Release: 0.6%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -503,6 +503,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Fri Jul 03 2020 Igor Raits - 3.18.0-0.6.rc2 +- Add out-of-source builds controlled by a macro (%%__cmake_out_of_source_build) + * Wed Jul 01 2020 Igor Raits - 3.18.0-0.5.rc2 - Undo out-of-source-builds diff --git a/macros.cmake b/macros.cmake index 0bf1119..d0e524e 100644 --- a/macros.cmake +++ b/macros.cmake @@ -7,6 +7,8 @@ %_cmake_version @@CMAKE_VERSION@@ %__cmake /usr/bin/cmake %__ctest /usr/bin/ctest +%__cmake_out_of_source_build 0 +%__cmake_builddir %[%{?__cmake_out_of_source_build} ? "%{_vpath_builddir}" : "."] # - Set default compile flags # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables @@ -25,6 +27,8 @@ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ %endif \ %__cmake \\\ + -S "%{_vpath_srcdir}" \\\ + -B "%{__cmake_builddir}" \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ @@ -37,16 +41,16 @@ %if "%{?_lib}" == "lib64" \ %{?_cmake_lib_suffix64} \\\ %endif \ - %{?_cmake_shared_libs} + %{?_cmake_shared_libs} %cmake_build \ - %__cmake --build "%{_vpath_builddir}" %{?_smp_mflags} --verbose + %__cmake --build "%{__cmake_builddir}" %{?_smp_mflags} --verbose %cmake_install \ - DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}" + DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}" %ctest(:-:) \ - cd "%{_vpath_builddir}" \ + cd "%{__cmake_builddir}" \ %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \ cd - From 169c293f4c2fe2f89cb97b0ad308ab5e471583ae Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 3 Jul 2020 11:43:04 -0400 Subject: [PATCH 016/238] Switch to implementation that is backwards compatible to older RPM - Change control macro for in-source/out-of-source to %__cmake_in_source_build --- cmake.spec | 6 +++++- macros.cmake | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 8fcaa99..5855640 100644 --- a/cmake.spec +++ b/cmake.spec @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.6%{?relsuf}%{?dist} +Release: 0.7%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -503,6 +503,10 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Fri Jul 03 2020 Neal Gompa - 3.18.0-0.7.rc2 +- Switch to implementation that is backwards compatible to older RPM +- Change control macro for in-source/out-of-source to %%__cmake_in_source_build + * Fri Jul 03 2020 Igor Raits - 3.18.0-0.6.rc2 - Add out-of-source builds controlled by a macro (%%__cmake_out_of_source_build) diff --git a/macros.cmake b/macros.cmake index d0e524e..7692f4d 100644 --- a/macros.cmake +++ b/macros.cmake @@ -7,8 +7,7 @@ %_cmake_version @@CMAKE_VERSION@@ %__cmake /usr/bin/cmake %__ctest /usr/bin/ctest -%__cmake_out_of_source_build 0 -%__cmake_builddir %[%{?__cmake_out_of_source_build} ? "%{_vpath_builddir}" : "."] +%__cmake_builddir %{!?__cmake_in_source_build:"%{_vpath_builddir}"}%{?__cmake_in_source_build:"."} # - Set default compile flags # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables From 8158da8089efacc03c0fdd2a9624432ad4817063 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 3 Jul 2020 11:51:15 -0400 Subject: [PATCH 017/238] Temporarily switch back to in-source builds --- macros.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/macros.cmake b/macros.cmake index 7692f4d..afb8858 100644 --- a/macros.cmake +++ b/macros.cmake @@ -7,6 +7,7 @@ %_cmake_version @@CMAKE_VERSION@@ %__cmake /usr/bin/cmake %__ctest /usr/bin/ctest +%__cmake_in_source_build 1 %__cmake_builddir %{!?__cmake_in_source_build:"%{_vpath_builddir}"}%{?__cmake_in_source_build:"."} # - Set default compile flags From f626219c986b59973fde7c584e12b602552d0537 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 3 Jul 2020 12:11:19 -0400 Subject: [PATCH 018/238] Fix __cmake_builddir macro definition --- macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.cmake b/macros.cmake index afb8858..8440d93 100644 --- a/macros.cmake +++ b/macros.cmake @@ -8,7 +8,7 @@ %__cmake /usr/bin/cmake %__ctest /usr/bin/ctest %__cmake_in_source_build 1 -%__cmake_builddir %{!?__cmake_in_source_build:"%{_vpath_builddir}"}%{?__cmake_in_source_build:"."} +%__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.} # - Set default compile flags # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables From 419924585f347ee0d4c399fe2af3ca870ea65d85 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Fri, 3 Jul 2020 22:35:31 +0200 Subject: [PATCH 019/238] Enable out-of-source builds Signed-off-by: Igor Raits --- cmake.spec | 5 ++++- macros.cmake | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 5855640..a245511 100644 --- a/cmake.spec +++ b/cmake.spec @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.7%{?relsuf}%{?dist} +Release: 0.8%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -503,6 +503,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Fri Jul 03 2020 Igor Raits - 3.18.0-0.8.rc2 +- Enable out-of-source builds + * Fri Jul 03 2020 Neal Gompa - 3.18.0-0.7.rc2 - Switch to implementation that is backwards compatible to older RPM - Change control macro for in-source/out-of-source to %%__cmake_in_source_build diff --git a/macros.cmake b/macros.cmake index 8440d93..06bdeda 100644 --- a/macros.cmake +++ b/macros.cmake @@ -7,7 +7,6 @@ %_cmake_version @@CMAKE_VERSION@@ %__cmake /usr/bin/cmake %__ctest /usr/bin/ctest -%__cmake_in_source_build 1 %__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.} # - Set default compile flags From fbadbabca656e9f69fcb7e01a038ab0c1d5e9d6d Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Fri, 3 Jul 2020 22:36:43 +0200 Subject: [PATCH 020/238] Revert "Enable out-of-source builds" This reverts commit 419924585f347ee0d4c399fe2af3ca870ea65d85. Signed-off-by: Igor Raits --- cmake.spec | 5 +---- macros.cmake | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index a245511..5855640 100644 --- a/cmake.spec +++ b/cmake.spec @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.8%{?relsuf}%{?dist} +Release: 0.7%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -503,9 +503,6 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog -* Fri Jul 03 2020 Igor Raits - 3.18.0-0.8.rc2 -- Enable out-of-source builds - * Fri Jul 03 2020 Neal Gompa - 3.18.0-0.7.rc2 - Switch to implementation that is backwards compatible to older RPM - Change control macro for in-source/out-of-source to %%__cmake_in_source_build diff --git a/macros.cmake b/macros.cmake index 06bdeda..8440d93 100644 --- a/macros.cmake +++ b/macros.cmake @@ -7,6 +7,7 @@ %_cmake_version @@CMAKE_VERSION@@ %__cmake /usr/bin/cmake %__ctest /usr/bin/ctest +%__cmake_in_source_build 1 %__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.} # - Set default compile flags From 8135e77c5bdeecfb1a1c62262802d709f8d7939b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 4 Jul 2020 13:05:57 +0200 Subject: [PATCH 021/238] Update to 3.18.0-rc3 --- cmake.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 5855640..8730600 100644 --- a/cmake.spec +++ b/cmake.spec @@ -57,7 +57,7 @@ %global major_version 3 %global minor_version 18 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc2 +%global rcsuf rc3 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.7%{?relsuf}%{?dist} +Release: 0.8%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -503,6 +503,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Sat Jul 04 2020 Björn Esser - 3.18.0-0.8.rc3 +- Update to 3.18.0-rc3 + * Fri Jul 03 2020 Neal Gompa - 3.18.0-0.7.rc2 - Switch to implementation that is backwards compatible to older RPM - Change control macro for in-source/out-of-source to %%__cmake_in_source_build diff --git a/sources b/sources index a145c0f..4459d23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.18.0-rc2.tar.gz) = 30f6a223151bbfd9d18c39d5236a7d420e4a526fa88f7254dfffe3dd456b2e6efe66ab206b4c9a9ac758ab4d1cb89a2484c52d90f9d7658a8093f6ee2dc90632 +SHA512 (cmake-3.18.0-rc3.tar.gz) = f4bda297c90d6449d6ef3adcf91debc61a9dbef65934dfd1447f86d30747b4b466bb813abe58ee3d6a3aa9e8e49d5e7cd118820e92bec3b2e52f06142faa017e From 91d8dab8829829caeb09656ce66bc95ec7207fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 16 Jul 2020 12:01:58 +0200 Subject: [PATCH 022/238] Update to 3.18.0 --- cmake-3.18.0-rc2-lua-5.4.patch | 63 ---------------------------------- cmake.spec | 9 ++--- sources | 2 +- 3 files changed, 6 insertions(+), 68 deletions(-) delete mode 100644 cmake-3.18.0-rc2-lua-5.4.patch diff --git a/cmake-3.18.0-rc2-lua-5.4.patch b/cmake-3.18.0-rc2-lua-5.4.patch deleted file mode 100644 index f13d30d..0000000 --- a/cmake-3.18.0-rc2-lua-5.4.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up cmake-3.18.0-rc2/Modules/FindLua.cmake.lua54 cmake-3.18.0-rc2/Modules/FindLua.cmake ---- cmake-3.18.0-rc2/Modules/FindLua.cmake.lua54 2020-06-30 14:17:05.897460893 -0400 -+++ cmake-3.18.0-rc2/Modules/FindLua.cmake 2020-06-30 14:17:16.173293679 -0400 -@@ -48,7 +48,7 @@ unset(_lua_append_versions) - - # this is a function only to have all the variables inside go away automatically - function(_lua_get_versions) -- set(LUA_VERSIONS5 5.3 5.2 5.1 5.0) -+ set(LUA_VERSIONS5 5.4 5.3 5.2 5.1 5.0) - - if (Lua_FIND_VERSION_EXACT) - if (Lua_FIND_VERSION_COUNT GREATER 1) -diff -up cmake-3.18.0-rc2/Tests/RunCMake/FindLua/FindLuaTest.cmake.lua54 cmake-3.18.0-rc2/Tests/RunCMake/FindLua/FindLuaTest.cmake ---- cmake-3.18.0-rc2/Tests/RunCMake/FindLua/FindLuaTest.cmake.lua54 2020-06-30 14:17:44.756828608 -0400 -+++ cmake-3.18.0-rc2/Tests/RunCMake/FindLua/FindLuaTest.cmake 2020-06-30 14:18:20.411248461 -0400 -@@ -59,15 +59,15 @@ function(test_path prefix_path lua_path - endfunction() - - # Simple test --test_path(prefix1 prefix1/include 5.3) -+test_path(prefix1 prefix1/include 5.4) - # Find highest version --test_path(prefix2 prefix2/include/lua5.3 5.3) --foreach(ver 5.3 5.2 5.1) -+test_path(prefix2 prefix2/include/lua5.4 5.4) -+foreach(ver 5.4 5.3 5.2 5.1) - # At least X or X.0 -> Highest - set(VERSION "${ver}") -- test_path(prefix2 prefix2/include/lua5.3 5.3) -+ test_path(prefix2 prefix2/include/lua5.4 5.4) - set(VERSION "${ver}.0") -- test_path(prefix2 prefix2/include/lua5.3 5.3) -+ test_path(prefix2 prefix2/include/lua5.4 5.4) - # Exactly X/X.0 - set(VERSION "${ver}" EXACT) - test_path(prefix2 prefix2/include/lua${ver} ${ver}) -diff -up cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix2/include/lua5.4/lua.h.lua54 cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix2/include/lua5.4/lua.h ---- cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix2/include/lua5.4/lua.h.lua54 2020-06-30 14:19:19.646284675 -0400 -+++ cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix2/include/lua5.4/lua.h 2020-06-30 14:19:11.988409288 -0400 -@@ -0,0 +1,8 @@ -+ -+#define LUA_VERSION_MAJOR "5" -+#define LUA_VERSION_MINOR "4" -+#define LUA_VERSION_NUM 504 -+#define LUA_VERSION_RELEASE "0" -+ -+#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR -+#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE -diff -up cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix1/include/lua.h.lua54 cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix1/include/lua.h ---- cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix1/include/lua.h.lua54 2020-06-30 15:05:35.332154492 -0400 -+++ cmake-3.18.0-rc2/Tests/RunCMake/FindLua/prefix1/include/lua.h 2020-06-30 15:05:51.201899127 -0400 -@@ -1,8 +1,8 @@ - - #define LUA_VERSION_MAJOR "5" --#define LUA_VERSION_MINOR "3" --#define LUA_VERSION_NUM 503 --#define LUA_VERSION_RELEASE "4" -+#define LUA_VERSION_MINOR "4" -+#define LUA_VERSION_NUM 504 -+#define LUA_VERSION_RELEASE "0" - - #define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR - #define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE diff --git a/cmake.spec b/cmake.spec index 8730600..e0cb769 100644 --- a/cmake.spec +++ b/cmake.spec @@ -57,7 +57,7 @@ %global major_version 3 %global minor_version 18 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc3 +#global rcsuf rc1 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.8%{?relsuf}%{?dist} +Release: 1%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -98,8 +98,6 @@ Patch101: %{name}-fedora-flag_release.patch # Add dl to CMAKE_DL_LIBS on MINGW # https://gitlab.kitware.com/cmake/cmake/issues/17600 Patch102: %{name}-mingw-dl.patch -# Fix FindLua to support Lua 5.4 -Patch103: %{name}-3.18.0-rc2-lua-5.4.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -503,6 +501,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Thu Jul 16 2020 Björn Esser - 3.18.0-1 +- Update to 3.18.0 + * Sat Jul 04 2020 Björn Esser - 3.18.0-0.8.rc3 - Update to 3.18.0-rc3 diff --git a/sources b/sources index 4459d23..da8da18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.18.0-rc3.tar.gz) = f4bda297c90d6449d6ef3adcf91debc61a9dbef65934dfd1447f86d30747b4b466bb813abe58ee3d6a3aa9e8e49d5e7cd118820e92bec3b2e52f06142faa017e +SHA512 (cmake-3.18.0.tar.gz) = 6cab76a792a7ed2120a50048312273b2870afef29351a3ebcbf76cbcb422f82be679c85211c19016a56ac7f63bbce6cea0478f491c973b8577e08168a1ba853d From 85ead680726cd4b5b1ed766ce3680b1a96173e79 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Fri, 3 Jul 2020 22:35:31 +0200 Subject: [PATCH 023/238] Enable out-of-source builds by default Signed-off-by: Igor Raits --- cmake.spec | 5 ++++- macros.cmake | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index e0cb769..8099865 100644 --- a/cmake.spec +++ b/cmake.spec @@ -67,7 +67,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 1%{?relsuf}%{?dist} +Release: 1%{?relsuf}%{?dist}.1 Summary: Cross-platform make system # most sources are BSD @@ -501,6 +501,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Sat Jul 18 2020 Igor Raits - 3.18.0-1.1 +- Enable out-of-source builds by default + * Thu Jul 16 2020 Björn Esser - 3.18.0-1 - Update to 3.18.0 diff --git a/macros.cmake b/macros.cmake index 8440d93..06bdeda 100644 --- a/macros.cmake +++ b/macros.cmake @@ -7,7 +7,6 @@ %_cmake_version @@CMAKE_VERSION@@ %__cmake /usr/bin/cmake %__ctest /usr/bin/ctest -%__cmake_in_source_build 1 %__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.} # - Set default compile flags From 672b300dfb2402410fc8ccd85012f0c37405f7af Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 19 Jul 2020 08:45:08 -0400 Subject: [PATCH 024/238] Make in-source builds behave like before --- macros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macros.cmake b/macros.cmake index 06bdeda..cd7702b 100644 --- a/macros.cmake +++ b/macros.cmake @@ -26,8 +26,8 @@ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ %endif \ %__cmake \\\ - -S "%{_vpath_srcdir}" \\\ - -B "%{__cmake_builddir}" \\\ + %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\ + %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ From 4b115b40c70346d2415ec79931ed11d491e07cca Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 19 Jul 2020 08:59:00 -0400 Subject: [PATCH 025/238] Bump release --- cmake.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 8099865..d45bf1a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -61,13 +61,16 @@ %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} +# For handling bump release by rpmdev-bumpspec and mass rebuild +%global baserelease 2 + # Uncomment if building for EPEL #global name_suffix %%{major_version} %global orig_name cmake Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 1%{?relsuf}%{?dist}.1 +Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -501,6 +504,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Sun Jul 19 2020 Neal Gompa - 3.18.0-2 +- Make in-source builds behave like before + * Sat Jul 18 2020 Igor Raits - 3.18.0-1.1 - Enable out-of-source builds by default From 5d587929de919b399c32ec1254363e389f6b933b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 21 Jul 2020 20:36:38 -0600 Subject: [PATCH 026/238] Default to --verbose for ctest as well --- macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.cmake b/macros.cmake index cd7702b..86c6288 100644 --- a/macros.cmake +++ b/macros.cmake @@ -50,7 +50,7 @@ %ctest(:-:) \ cd "%{__cmake_builddir}" \ - %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \ + %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} --verbose %{**} \ cd - From 5bf1d33bf142d49c41b98e2096df2e39fe93e187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 22 Jul 2020 22:24:22 +0200 Subject: [PATCH 027/238] Default to --verbose for ctest as well --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index d45bf1a..2bdbfc0 100644 --- a/cmake.spec +++ b/cmake.spec @@ -62,7 +62,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -504,6 +504,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Wed Jul 22 2020 Björn Esser - 3.18.0-3 +- Default to --verbose for ctest as well + * Sun Jul 19 2020 Neal Gompa - 3.18.0-2 - Make in-source builds behave like before From 43677c13f5d961f34dd1d93806210c25fb8578bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 14:10:50 +0000 Subject: [PATCH 028/238] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 2bdbfc0..e05989e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -62,7 +62,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -504,6 +504,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 3.18.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 22 2020 Björn Esser - 3.18.0-3 - Default to --verbose for ctest as well From 8674426d570668993696a7e9f2a4d31711bc47ee Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 29 Jul 2020 22:03:29 -0600 Subject: [PATCH 029/238] Handle arguments for ctest3 macro --- cmake.spec | 5 ++++- macros.cmake | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index e05989e..6fff598 100644 --- a/cmake.spec +++ b/cmake.spec @@ -62,7 +62,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 4 +%global baserelease 5 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -504,6 +504,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Wed Jul 29 2020 Orion Poplawski - 3.18.0-5 +- Handle arguments for ctest3 macro + * Mon Jul 27 2020 Fedora Release Engineering - 3.18.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/macros.cmake b/macros.cmake index 86c6288..8cdcc15 100644 --- a/macros.cmake +++ b/macros.cmake @@ -57,4 +57,4 @@ %cmake@@CMAKE_MAJOR_VERSION@@ %cmake %cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build %cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install -%ctest@@CMAKE_MAJOR_VERSION@@ %ctest +%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**} From 7ec8c694fa3d2916cf0530a203a262888b855fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Aug 2020 12:29:55 +0200 Subject: [PATCH 030/238] Update to 3.18.1 --- cmake.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 6fff598..3bc1547 100644 --- a/cmake.spec +++ b/cmake.spec @@ -62,14 +62,14 @@ %{?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}.0 +Version: %{major_version}.%{minor_version}.1 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -504,6 +504,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Sat Aug 01 2020 Björn Esser - 3.18.1-1 +- Update to 3.18.1 + * Wed Jul 29 2020 Orion Poplawski - 3.18.0-5 - Handle arguments for ctest3 macro diff --git a/sources b/sources index da8da18..e513e0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.18.0.tar.gz) = 6cab76a792a7ed2120a50048312273b2870afef29351a3ebcbf76cbcb422f82be679c85211c19016a56ac7f63bbce6cea0478f491c973b8577e08168a1ba853d +SHA512 (cmake-3.18.1.tar.gz) = e0591d5fb234f3e7b74d6d2aad44fbf3e19e69547bd428681ba6ad0461d4f3d2a154605808b4733531d2c66f0e91eb39a179ae0d89a37e92a3f20e9cae691468 From 6d388a4073ddea0d734745772741197e94cf6adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 20 Aug 2020 22:01:22 +0200 Subject: [PATCH 031/238] Update to 3.18.2 --- cmake.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 3bc1547..d264023 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.1 +Version: %{major_version}.%{minor_version}.2 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -504,6 +504,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Thu Aug 20 2020 Björn Esser - 3.18.2-1 +- Update to 3.18.2 + * Sat Aug 01 2020 Björn Esser - 3.18.1-1 - Update to 3.18.1 diff --git a/sources b/sources index e513e0e..7a25ba2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.18.1.tar.gz) = e0591d5fb234f3e7b74d6d2aad44fbf3e19e69547bd428681ba6ad0461d4f3d2a154605808b4733531d2c66f0e91eb39a179ae0d89a37e92a3f20e9cae691468 +SHA512 (cmake-3.18.2.tar.gz) = 74915e643d09af1d8451e57120f2e5963f6fd34ca2cfa0cd573bd7f234924458105e7cc76952c022732de7566cd590141127b243933a564ac575a0dcbb8cc6e7 From c9bb4a4953aceebba4fe51db970ef5f19c89f762 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 29 Sep 2020 10:31:29 -0600 Subject: [PATCH 032/238] Make %ctest non-verbose by default --- cmake.spec | 5 ++++- macros.cmake | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index d264023..2a57e0c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -62,7 +62,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} @@ -504,6 +504,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Tue Sep 29 2020 Christoph Junghans - 3.18.2-2 +- Make %ctest non-verbose by default + * Thu Aug 20 2020 Björn Esser - 3.18.2-1 - Update to 3.18.2 diff --git a/macros.cmake b/macros.cmake index 8cdcc15..5749a32 100644 --- a/macros.cmake +++ b/macros.cmake @@ -50,7 +50,7 @@ %ctest(:-:) \ cd "%{__cmake_builddir}" \ - %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} --verbose %{**} \ + %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \ cd - From bdf3093d628a9349f4b8ca24718bb6d792e64ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 30 Sep 2020 12:55:31 +0200 Subject: [PATCH 033/238] Update to 3.18.3 --- cmake.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 2a57e0c..9c0214c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -62,14 +62,14 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%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 +Version: %{major_version}.%{minor_version}.3 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -504,6 +504,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Wed Sep 30 12:49:57 CEST 2020 Björn Esser - 3.18.3-1 +- Update to 3.18.3 + * Tue Sep 29 2020 Christoph Junghans - 3.18.2-2 - Make %ctest non-verbose by default diff --git a/sources b/sources index 7a25ba2..68847cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.18.2.tar.gz) = 74915e643d09af1d8451e57120f2e5963f6fd34ca2cfa0cd573bd7f234924458105e7cc76952c022732de7566cd590141127b243933a564ac575a0dcbb8cc6e7 +SHA512 (cmake-3.18.3.tar.gz) = 28c0c310b6cd8117d4a8b9ad60064b22b00bdc170303b190994e9a3d4fe83fbd9cae6c8f36da62faf6c356b5acf430c78878f19210386ec26844b56334d3941e From 372a70dc795736ded10941ad9508c20f14d0ae4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 30 Sep 2020 12:56:24 +0200 Subject: [PATCH 034/238] Explicitly require make --- cmake.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake.spec b/cmake.spec index 9c0214c..60c6e8a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -177,6 +177,9 @@ Requires: %{name}-data = %{version}-%{release} Requires: %{name}-rpm-macros = %{version}-%{release} Requires: %{name}-filesystem%{?_isa} = %{version}-%{release} +# Explicitly require make. (rhbz#1862014) +Requires: make + # Provide the major version name Provides: %{orig_name}%{major_version} = %{version}-%{release} @@ -506,6 +509,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog * Wed Sep 30 12:49:57 CEST 2020 Björn Esser - 3.18.3-1 - Update to 3.18.3 +- Explicitly require make * Tue Sep 29 2020 Christoph Junghans - 3.18.2-2 - Make %ctest non-verbose by default From 4ad1e486f51c98818dce59f9140451717408dc50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 30 Sep 2020 13:00:27 +0200 Subject: [PATCH 035/238] Add patch to support FlexiBLAS --- cmake-3.18.3-findblas.patch | 69 +++++++++++++++++++++++++++++++++++++ cmake.spec | 3 ++ 2 files changed, 72 insertions(+) create mode 100644 cmake-3.18.3-findblas.patch diff --git a/cmake-3.18.3-findblas.patch b/cmake-3.18.3-findblas.patch new file mode 100644 index 0000000..94ab505 --- /dev/null +++ b/cmake-3.18.3-findblas.patch @@ -0,0 +1,69 @@ +diff -ur cmake-3.18.2.orig/Modules/FindBLAS.cmake cmake-3.18.2/Modules/FindBLAS.cmake +--- cmake-3.18.2.orig/Modules/FindBLAS.cmake 2020-08-20 14:20:32.000000000 +0200 ++++ cmake-3.18.2/Modules/FindBLAS.cmake 2020-09-14 19:36:13.952349073 +0200 +@@ -27,6 +27,7 @@ + possibilities. List of vendors valid in this module: + + * ``Goto`` ++ * ``FlexiBLAS`` + * ``OpenBLAS`` + * ``FLAME`` + * ``ATLAS PhiPACK`` +@@ -538,6 +539,22 @@ + "" + "" + "" ++ ) ++ endif() ++endif() ++ ++# FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/) ++if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All") ++ if(NOT BLAS_LIBRARIES) ++ check_blas_libraries( ++ BLAS_LIBRARIES ++ BLAS ++ sgemm ++ "" ++ "flexiblas" ++ "" ++ "" ++ "" + ) + endif() + endif() +diff -ur cmake-3.18.2.orig/Modules/FindLAPACK.cmake cmake-3.18.2/Modules/FindLAPACK.cmake +--- cmake-3.18.2.orig/Modules/FindLAPACK.cmake 2020-08-20 14:20:32.000000000 +0200 ++++ cmake-3.18.2/Modules/FindLAPACK.cmake 2020-09-14 19:38:43.204639078 +0200 +@@ -26,6 +26,7 @@ + If set, checks only the specified vendor, if not set checks all the + possibilities. List of vendors valid in this module: + ++ * ``FlexiBLAS`` + * ``OpenBLAS`` + * ``FLAME`` + * ``Intel10_32`` (intel mkl v10 32 bit) +@@ -349,6 +350,23 @@ + "" + "" + "" ++ "${BLAS_LIBRARIES}" ++ ) ++ endif() ++ endif() ++ ++ # FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/) ++ if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All") ++ if(NOT LAPACK_LIBRARIES) ++ check_lapack_libraries( ++ LAPACK_LIBRARIES ++ LAPACK ++ cheev ++ "" ++ "flexiblas" ++ "" ++ "" ++ "" + "${BLAS_LIBRARIES}" + ) + endif() diff --git a/cmake.spec b/cmake.spec index 60c6e8a..a4c0098 100644 --- a/cmake.spec +++ b/cmake.spec @@ -101,6 +101,8 @@ Patch101: %{name}-fedora-flag_release.patch # Add dl to CMAKE_DL_LIBS on MINGW # https://gitlab.kitware.com/cmake/cmake/issues/17600 Patch102: %{name}-mingw-dl.patch +# rhbz#1871346 +Patch103: %{name}-3.18.3-findblas.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -510,6 +512,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake * Wed Sep 30 12:49:57 CEST 2020 Björn Esser - 3.18.3-1 - Update to 3.18.3 - Explicitly require make +- Add patch to support FlexiBLAS * Tue Sep 29 2020 Christoph Junghans - 3.18.2-2 - Make %ctest non-verbose by default From 946181a294641a505e80490f7f68736e923be8c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 13 Oct 2020 10:04:14 +0200 Subject: [PATCH 036/238] Update to 3.18.4 --- cmake.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index a4c0098..0ee43cb 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.3 +Version: %{major_version}.%{minor_version}.4 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -509,6 +509,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Tue Oct 13 10:03:16 CEST 2020 Björn Esser - 3.18.4-1 +- Update to 3.18.4 + * Wed Sep 30 12:49:57 CEST 2020 Björn Esser - 3.18.3-1 - Update to 3.18.3 - Explicitly require make diff --git a/sources b/sources index 68847cb..513aff4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.18.3.tar.gz) = 28c0c310b6cd8117d4a8b9ad60064b22b00bdc170303b190994e9a3d4fe83fbd9cae6c8f36da62faf6c356b5acf430c78878f19210386ec26844b56334d3941e +SHA512 (cmake-3.18.4.tar.gz) = 2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9 From 1ab5d69fabc5b7dd199b0cdd96d9cbdb7310b020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 9 Nov 2020 17:44:30 +0100 Subject: [PATCH 037/238] Add Python 3.10 to the hadcoded lists of Python versions --- 5383.patch | 25 +++++++++++++++++++++++++ 5482.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ cmake.spec | 8 +++++++- 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 5383.patch create mode 100644 5482.patch diff --git a/5383.patch b/5383.patch new file mode 100644 index 0000000..c864386 --- /dev/null +++ b/5383.patch @@ -0,0 +1,25 @@ +From 23cd98a66a3eca1cc8e89a77f4fdf406c4f4c113 Mon Sep 17 00:00:00 2001 +From: Marc Chevrier +Date: Fri, 16 Oct 2020 11:36:53 +0200 +Subject: [PATCH] FindPython: Add support of version 3.10 + +--- + Modules/FindPython/Support.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake +index 7de2d29946..2b911ae7e3 100644 +--- a/Modules/FindPython/Support.cmake ++++ b/Modules/FindPython/Support.cmake +@@ -22,7 +22,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR) + message (FATAL_ERROR "FindPython: INTERNAL ERROR") + endif() + if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3") +- set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++ set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2") + set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) + else() +-- +GitLab + diff --git a/5482.patch b/5482.patch new file mode 100644 index 0000000..c259de7 --- /dev/null +++ b/5482.patch @@ -0,0 +1,42 @@ +From bb2ebbf2412ef9343f50a45868459ffb95fa9081 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Mon, 9 Nov 2020 17:35:13 +0100 +Subject: [PATCH] FindPython{Interp,Libs}: Add support for version 3.10 + +Extend the change from commit 23cd98a66a (FindPython: Add support of +version 3.10, 2020-10-16, v3.19.0-rc2~25^2) to cover the legacy +`FindPython{Interp,Libs}` modules too. +--- + Modules/FindPythonInterp.cmake | 2 +- + Modules/FindPythonLibs.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake +index 1e01a99cbe..efe0f11901 100644 +--- a/Modules/FindPythonInterp.cmake ++++ b/Modules/FindPythonInterp.cmake +@@ -54,7 +54,7 @@ unset(_Python_NAMES) + + set(_PYTHON1_VERSIONS 1.6 1.5) + set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) +-set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + + if(PythonInterp_FIND_VERSION) + if(PythonInterp_FIND_VERSION_COUNT GREATER 1) +diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake +index d3ec7beec6..396f0d2ed4 100644 +--- a/Modules/FindPythonLibs.cmake ++++ b/Modules/FindPythonLibs.cmake +@@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST) + + set(_PYTHON1_VERSIONS 1.6 1.5) + set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) +-set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + + if(PythonLibs_FIND_VERSION) + if(PythonLibs_FIND_VERSION_COUNT GREATER 1) +-- +GitLab + diff --git a/cmake.spec b/cmake.spec index 0ee43cb..2ead551 100644 --- a/cmake.spec +++ b/cmake.spec @@ -62,7 +62,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} @@ -103,6 +103,9 @@ Patch101: %{name}-fedora-flag_release.patch Patch102: %{name}-mingw-dl.patch # rhbz#1871346 Patch103: %{name}-3.18.3-findblas.patch +# Add Python 3.10 to the hadcoded lists of Python versions +Patch104: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5383.patch +Patch105: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5482.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -509,6 +512,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Mon Nov 09 2020 Miro Hrončok - 3.18.4-2 +- Add support for Python 3.10 + * Tue Oct 13 10:03:16 CEST 2020 Björn Esser - 3.18.4-1 - Update to 3.18.4 From 5db80372484f05e17443471f5d93e5bb6c638592 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 20 Nov 2020 08:32:34 -0500 Subject: [PATCH 038/238] Ensure CMake does not strip binaries with package builds --- cmake.spec | 5 ++++- macros.cmake | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 2ead551..cb2c87d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -62,7 +62,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -512,6 +512,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Fri Nov 20 08:32:34 EST 2020 Neal Gompa - 3.18.4-3 +- Ensure CMake does not strip binaries with package builds + * Mon Nov 09 2020 Miro Hrončok - 3.18.4-2 - Add support for Python 3.10 diff --git a/macros.cmake b/macros.cmake index 5749a32..54598ee 100644 --- a/macros.cmake +++ b/macros.cmake @@ -13,6 +13,7 @@ # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables # and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS # - Turn on verbose makefiles so we can see and verify compile flags +# - Turn off stripping by default so RPM can do it separately # - Set default install prefixes and library install directories # - Turn on shared libraries by default %cmake \ @@ -32,6 +33,7 @@ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ + -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ From 61280587ecfcbcd9ab62a0bba9f35cfdb74e78ca Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 9 Nov 2020 22:08:07 +0000 Subject: [PATCH 039/238] Update BuildRequires for eln jsoncpp and rhash are going to be removed from eln. --- cmake.spec | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index cb2c87d..8792f03 100644 --- a/cmake.spec +++ b/cmake.spec @@ -39,6 +39,14 @@ %bcond_without sphinx %endif +%if !0%{?rhel} +%bcond_with bundled_jsoncpp +%bcond_with bundled_rhash +%else +%bcond_without bundled_jsoncpp +%bcond_without bundled_rhash +%endif + # Run tests %bcond_without test @@ -62,7 +70,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -139,14 +147,22 @@ BuildRequires: %{_bindir}/sphinx-build BuildRequires: bzip2-devel BuildRequires: curl-devel BuildRequires: expat-devel +%if %{with bundled_jsoncpp} +Provides: bundled(jsoncpp) +%else BuildRequires: jsoncpp-devel +%endif %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: libarchive-devel %else BuildRequires: libarchive3-devel %endif BuildRequires: libuv-devel +%if %{with bundled_rhash} +Provides: bundled(rhash) +%else BuildRequires: rhash-devel +%endif BuildRequires: xz-devel BuildRequires: zlib-devel BuildRequires: vim-filesystem @@ -295,6 +311,12 @@ $SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \ --docdir=/share/doc/%{name} --mandir=/share/man \ --%{?with_bootstrap:no-}system-libs \ --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \ +%if %{with bundled_rhash} + --no-system-librhash \ +%endif +%if %{with bundled_jsoncpp} + --no-system-jsoncpp \ +%endif %if %{with sphinx} --sphinx-man --sphinx-html \ %else @@ -512,6 +534,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Tue Dec 15 2020 Tom Stellard - 3.18.4-4 +- Update BuildRequires for eln + * Fri Nov 20 08:32:34 EST 2020 Neal Gompa - 3.18.4-3 - Ensure CMake does not strip binaries with package builds From a3fc67c060ebaf01ebfb240b5e2639175b394cfc Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 19 Dec 2020 05:14:27 +0000 Subject: [PATCH 040/238] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- cmake.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake.spec b/cmake.spec index 8792f03..dd75790 100644 --- a/cmake.spec +++ b/cmake.spec @@ -193,6 +193,7 @@ BuildRequires: desktop-file-utils # Ensure we have our own rpm-macros in place during build. BuildRequires: %{name}-rpm-macros %endif +BuildRequires: make Requires: %{name}-data = %{version}-%{release} Requires: %{name}-rpm-macros = %{version}-%{release} From a6595cacfa1375c00af94eda15b2bfd37dff7bed Mon Sep 17 00:00:00 2001 From: Cristian Morales Vega Date: Mon, 11 Jan 2021 17:27:28 +0000 Subject: [PATCH 041/238] Update to 3.19.2 --- 5383.patch | 25 -------------- 5482.patch | 42 ---------------------- cmake-3.18.3-findblas.patch | 69 ------------------------------------- cmake.spec | 14 ++++---- sources | 2 +- 5 files changed, 7 insertions(+), 145 deletions(-) delete mode 100644 5383.patch delete mode 100644 5482.patch delete mode 100644 cmake-3.18.3-findblas.patch diff --git a/5383.patch b/5383.patch deleted file mode 100644 index c864386..0000000 --- a/5383.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 23cd98a66a3eca1cc8e89a77f4fdf406c4f4c113 Mon Sep 17 00:00:00 2001 -From: Marc Chevrier -Date: Fri, 16 Oct 2020 11:36:53 +0200 -Subject: [PATCH] FindPython: Add support of version 3.10 - ---- - Modules/FindPython/Support.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake -index 7de2d29946..2b911ae7e3 100644 ---- a/Modules/FindPython/Support.cmake -+++ b/Modules/FindPython/Support.cmake -@@ -22,7 +22,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR) - message (FATAL_ERROR "FindPython: INTERNAL ERROR") - endif() - if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3") -- set(_${_PYTHON_PREFIX}_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+ set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2") - set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) - else() --- -GitLab - diff --git a/5482.patch b/5482.patch deleted file mode 100644 index c259de7..0000000 --- a/5482.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bb2ebbf2412ef9343f50a45868459ffb95fa9081 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Mon, 9 Nov 2020 17:35:13 +0100 -Subject: [PATCH] FindPython{Interp,Libs}: Add support for version 3.10 - -Extend the change from commit 23cd98a66a (FindPython: Add support of -version 3.10, 2020-10-16, v3.19.0-rc2~25^2) to cover the legacy -`FindPython{Interp,Libs}` modules too. ---- - Modules/FindPythonInterp.cmake | 2 +- - Modules/FindPythonLibs.cmake | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake -index 1e01a99cbe..efe0f11901 100644 ---- a/Modules/FindPythonInterp.cmake -+++ b/Modules/FindPythonInterp.cmake -@@ -54,7 +54,7 @@ unset(_Python_NAMES) - - set(_PYTHON1_VERSIONS 1.6 1.5) - set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) --set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(PythonInterp_FIND_VERSION) - if(PythonInterp_FIND_VERSION_COUNT GREATER 1) -diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake -index d3ec7beec6..396f0d2ed4 100644 ---- a/Modules/FindPythonLibs.cmake -+++ b/Modules/FindPythonLibs.cmake -@@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST) - - set(_PYTHON1_VERSIONS 1.6 1.5) - set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) --set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(PythonLibs_FIND_VERSION) - if(PythonLibs_FIND_VERSION_COUNT GREATER 1) --- -GitLab - diff --git a/cmake-3.18.3-findblas.patch b/cmake-3.18.3-findblas.patch deleted file mode 100644 index 94ab505..0000000 --- a/cmake-3.18.3-findblas.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -ur cmake-3.18.2.orig/Modules/FindBLAS.cmake cmake-3.18.2/Modules/FindBLAS.cmake ---- cmake-3.18.2.orig/Modules/FindBLAS.cmake 2020-08-20 14:20:32.000000000 +0200 -+++ cmake-3.18.2/Modules/FindBLAS.cmake 2020-09-14 19:36:13.952349073 +0200 -@@ -27,6 +27,7 @@ - possibilities. List of vendors valid in this module: - - * ``Goto`` -+ * ``FlexiBLAS`` - * ``OpenBLAS`` - * ``FLAME`` - * ``ATLAS PhiPACK`` -@@ -538,6 +539,22 @@ - "" - "" - "" -+ ) -+ endif() -+endif() -+ -+# FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/) -+if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All") -+ if(NOT BLAS_LIBRARIES) -+ check_blas_libraries( -+ BLAS_LIBRARIES -+ BLAS -+ sgemm -+ "" -+ "flexiblas" -+ "" -+ "" -+ "" - ) - endif() - endif() -diff -ur cmake-3.18.2.orig/Modules/FindLAPACK.cmake cmake-3.18.2/Modules/FindLAPACK.cmake ---- cmake-3.18.2.orig/Modules/FindLAPACK.cmake 2020-08-20 14:20:32.000000000 +0200 -+++ cmake-3.18.2/Modules/FindLAPACK.cmake 2020-09-14 19:38:43.204639078 +0200 -@@ -26,6 +26,7 @@ - If set, checks only the specified vendor, if not set checks all the - possibilities. List of vendors valid in this module: - -+ * ``FlexiBLAS`` - * ``OpenBLAS`` - * ``FLAME`` - * ``Intel10_32`` (intel mkl v10 32 bit) -@@ -349,6 +350,23 @@ - "" - "" - "" -+ "${BLAS_LIBRARIES}" -+ ) -+ endif() -+ endif() -+ -+ # FlexiBLAS? (http://www.mpi-magdeburg.mpg.de/mpcsc/software/FlexiBLAS/) -+ if(BLA_VENDOR STREQUAL "FlexiBLAS" OR BLA_VENDOR STREQUAL "All") -+ if(NOT LAPACK_LIBRARIES) -+ check_lapack_libraries( -+ LAPACK_LIBRARIES -+ LAPACK -+ cheev -+ "" -+ "flexiblas" -+ "" -+ "" -+ "" - "${BLAS_LIBRARIES}" - ) - endif() diff --git a/cmake.spec b/cmake.spec index dd75790..fb9853f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -63,21 +63,21 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 18 +%global minor_version 19 # 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 4 +%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}.4 +Version: %{major_version}.%{minor_version}.2 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -109,11 +109,6 @@ Patch101: %{name}-fedora-flag_release.patch # Add dl to CMAKE_DL_LIBS on MINGW # https://gitlab.kitware.com/cmake/cmake/issues/17600 Patch102: %{name}-mingw-dl.patch -# rhbz#1871346 -Patch103: %{name}-3.18.3-findblas.patch -# Add Python 3.10 to the hadcoded lists of Python versions -Patch104: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5383.patch -Patch105: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5482.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -535,6 +530,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Mon Jan 11 2021 Cristian Morales Vega - 3.19.2-1 +- Update to 3.19.2 + * Tue Dec 15 2020 Tom Stellard - 3.18.4-4 - Update BuildRequires for eln diff --git a/sources b/sources index 513aff4..cefa33b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.18.4.tar.gz) = 2f0c5647ed58bf911d0bfeafc7f22a3de09aa3be86301158fa51c8560e994534d7500869067432ecf91e82213a0b36ddb5db11c5c55d2ca5e5647ac9f75717b9 +SHA512 (cmake-3.19.2.tar.gz) = d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a From c99e94ccd34451c2b6e6fdd72033014ba56deedc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 12 Jan 2021 12:24:48 -0600 Subject: [PATCH 042/238] one test (sometimes?) runs out of memory on i686, so limit parallelism as a workaround --- cmake.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index fb9853f..ef806c1 100644 --- a/cmake.spec +++ b/cmake.spec @@ -456,9 +456,15 @@ NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" %if %{with bootstrap} NO_TEST="$NO_TEST|curl" %endif -bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure +%ifarch %{ix86} +# one test (sometimes?) runs out of memory, so limit parallelism as a workaround -- rdieter +%global smp_mflags -j2 +%else +%global smp_mflags %{?smp_mflags} +%endif +bin/ctest%{?name_suffix} %{?smp_mflags} -V -E "$NO_TEST" --output-on-failure # Keep an eye on failing tests -bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || : +bin/ctest%{?name_suffix} %{?smp_mflags} -V -R "$NO_TEST" --output-on-failure || : popd %if 0%{?rhel} && 0%{?rhel} <= 6 mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake From 87a1114ba4bc4ae5c843fbb85fe5c0fe844b7af0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 12 Jan 2021 16:50:36 -0600 Subject: [PATCH 043/238] memory-hungry tests when building on koji builders with *lots* of cores ... so limit it to some reasonable number (4) --- cmake-3.19-CPACK_ARCHIVE_THREADS.patch | 11 +++++++++++ cmake.spec | 13 +++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 cmake-3.19-CPACK_ARCHIVE_THREADS.patch diff --git a/cmake-3.19-CPACK_ARCHIVE_THREADS.patch b/cmake-3.19-CPACK_ARCHIVE_THREADS.patch new file mode 100644 index 0000000..bdf99a3 --- /dev/null +++ b/cmake-3.19-CPACK_ARCHIVE_THREADS.patch @@ -0,0 +1,11 @@ +diff -up cmake-3.19.2/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake.CPACK_ARCHIVE_THREADS cmake-3.19.2/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake +--- cmake-3.19.2/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake.CPACK_ARCHIVE_THREADS 2020-12-16 06:35:29.000000000 -0600 ++++ cmake-3.19.2/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake 2021-01-12 16:47:40.139581556 -0600 +@@ -1,6 +1,6 @@ + install(FILES CMakeLists.txt DESTINATION foo COMPONENT test) + +-set(CPACK_ARCHIVE_THREADS 0) ++set(CPACK_ARCHIVE_THREADS 4) + + if(PACKAGING_TYPE STREQUAL "COMPONENT") + set(CPACK_COMPONENTS_ALL test) diff --git a/cmake.spec b/cmake.spec index ef806c1..8901405 100644 --- a/cmake.spec +++ b/cmake.spec @@ -117,6 +117,9 @@ Patch1: %{name}-rename.patch Patch2: %{name}-libarchive3.patch %endif %endif +# memory-hungry tests when building on koji builders with *lots* of cores +# so limit it to some reasonable number (4) +Patch3: cmake-3.19-CPACK_ARCHIVE_THREADS.patch BuildRequires: coreutils BuildRequires: findutils @@ -456,15 +459,9 @@ NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" %if %{with bootstrap} NO_TEST="$NO_TEST|curl" %endif -%ifarch %{ix86} -# one test (sometimes?) runs out of memory, so limit parallelism as a workaround -- rdieter -%global smp_mflags -j2 -%else -%global smp_mflags %{?smp_mflags} -%endif -bin/ctest%{?name_suffix} %{?smp_mflags} -V -E "$NO_TEST" --output-on-failure +bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure # Keep an eye on failing tests -bin/ctest%{?name_suffix} %{?smp_mflags} -V -R "$NO_TEST" --output-on-failure || : +bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || : popd %if 0%{?rhel} && 0%{?rhel} <= 6 mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake From 3284292dcd8a97c088f2d5105d0bdd6dce10d6a0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 13 Jan 2021 09:30:49 -0600 Subject: [PATCH 044/238] cmake-3.19.3 --- cmake.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 8901405..27d0905 100644 --- a/cmake.spec +++ b/cmake.spec @@ -77,7 +77,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.2 +Version: %{major_version}.%{minor_version}.3 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -533,6 +533,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Wed Jan 13 2021 Rex Dieter - 3.19.3-1 +- cmake-3.19.3 + * Mon Jan 11 2021 Cristian Morales Vega - 3.19.2-1 - Update to 3.19.2 diff --git a/sources b/sources index cefa33b..6ea7749 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.19.2.tar.gz) = d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a +SHA512 (cmake-3.19.3.tar.gz) = 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5 From 27354e45c105377a6a84bd6ed9b6746bf3bff5f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:10:45 +0000 Subject: [PATCH 045/238] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 27d0905..7a2d361 100644 --- a/cmake.spec +++ b/cmake.spec @@ -70,7 +70,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} @@ -533,6 +533,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 3.19.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 13 2021 Rex Dieter - 3.19.3-1 - cmake-3.19.3 From 90c00fbf34a2660084eeef3a367f3ee7c0a2d96e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 28 Jan 2021 15:43:16 -0600 Subject: [PATCH 046/238] cmake-3.19.4 --- cmake.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 7a2d361..5e65873 100644 --- a/cmake.spec +++ b/cmake.spec @@ -70,14 +70,14 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%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}.3 +Version: %{major_version}.%{minor_version}.4 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -533,6 +533,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Thu Jan 28 2021 Rex Dieter - 3.19.4-1 +- cmake-3.19.4 + * Tue Jan 26 2021 Fedora Release Engineering - 3.19.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 6ea7749..aacd71b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.19.3.tar.gz) = 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5 +SHA512 (cmake-3.19.4.tar.gz) = e2781479d2185f8f927439b795120a0f4957e9da7730804ff8ec06d6bbe75a0069e49d95e642706179520a7229ae82e53bab891fa8cfd859913c0cb5fd4e843f From 77583d3966d5ab3a2fda49b2b16bf8ed2eafa5bc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 6 Feb 2021 22:31:22 -0600 Subject: [PATCH 047/238] CMake warning when searching for Boost 1.75 (#1925355) --- ...FindBoost-Add-support-for-Boost-1.75.patch | 74 +++++++++++++++++++ cmake.spec | 13 +++- 2 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 0572-FindBoost-Add-support-for-Boost-1.75.patch diff --git a/0572-FindBoost-Add-support-for-Boost-1.75.patch b/0572-FindBoost-Add-support-for-Boost-1.75.patch new file mode 100644 index 0000000..75c0bb5 --- /dev/null +++ b/0572-FindBoost-Add-support-for-Boost-1.75.patch @@ -0,0 +1,74 @@ +From 82930647607d23b118c84194afc3c70d6d8e79e3 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Wed, 3 Feb 2021 12:07:49 -0500 +Subject: [PATCH 572/590] FindBoost: Add support for Boost 1.75 + +Update the list of known versions. + +Run the command + + cmake -DBOOST_DIR=/path/to/boost_1_75_0 \ + -P Utilities/Scripts/BoostScanDeps.cmake + +to extract dependencies from the 1.75.0 source tree. +They differ from 1.74's dependencies by the addition of +dependencies of the json component, so add a new version +block to FindBoost. + +Fixes: #21773 +--- + Modules/FindBoost.cmake | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake +index 00e4ff1d21..54d9593ca7 100644 +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -1186,11 +1186,26 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + set(_Boost_TIMER_DEPENDENCIES chrono) + set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) ++ elseif(Boost_VERSION_STRING VERSION_LESS 1.75.0) ++ set(_Boost_CONTRACT_DEPENDENCIES thread chrono date_time) ++ set(_Boost_COROUTINE_DEPENDENCIES context) ++ set(_Boost_FIBER_DEPENDENCIES context) ++ set(_Boost_IOSTREAMS_DEPENDENCIES regex) ++ set(_Boost_LOG_DEPENDENCIES date_time log_setup filesystem thread regex chrono atomic) ++ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic) ++ set(_Boost_MPI_DEPENDENCIES serialization) ++ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization) ++ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version}) ++ set(_Boost_THREAD_DEPENDENCIES chrono date_time atomic) ++ set(_Boost_TIMER_DEPENDENCIES chrono) ++ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic) ++ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) + else() + set(_Boost_CONTRACT_DEPENDENCIES thread chrono date_time) + set(_Boost_COROUTINE_DEPENDENCIES context) + set(_Boost_FIBER_DEPENDENCIES context) + set(_Boost_IOSTREAMS_DEPENDENCIES regex) ++ set(_Boost_JSON_DEPENDENCIES container) + set(_Boost_LOG_DEPENDENCIES date_time log_setup filesystem thread regex chrono atomic) + set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic) + set(_Boost_MPI_DEPENDENCIES serialization) +@@ -1200,7 +1215,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + set(_Boost_TIMER_DEPENDENCIES chrono) + set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) +- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.75.0) ++ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.76.0) + message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") + endif() + endif() +@@ -1472,7 +1487,7 @@ else() + # _Boost_COMPONENT_HEADERS. See the instructions at the top of + # _Boost_COMPONENT_DEPENDENCIES. + set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} +- "1.74.0" "1.74" ++ "1.75.0" "1.75" "1.74.0" "1.74" + "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" + "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" + "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" +-- +2.29.2 + diff --git a/cmake.spec b/cmake.spec index 5e65873..0081f7f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -70,7 +70,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} @@ -109,6 +109,11 @@ Patch101: %{name}-fedora-flag_release.patch # 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.19-CPACK_ARCHIVE_THREADS.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1925355 +Patch104: 0572-FindBoost-Add-support-for-Boost-1.75.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -117,9 +122,6 @@ Patch1: %{name}-rename.patch Patch2: %{name}-libarchive3.patch %endif %endif -# memory-hungry tests when building on koji builders with *lots* of cores -# so limit it to some reasonable number (4) -Patch3: cmake-3.19-CPACK_ARCHIVE_THREADS.patch BuildRequires: coreutils BuildRequires: findutils @@ -533,6 +535,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Sat Feb 06 2021 Rex Dieter - 3.19.4-2 +- CMake warning when searching for Boost 1.75 (#1925355) + * Thu Jan 28 2021 Rex Dieter - 3.19.4-1 - cmake-3.19.4 From 63c436655e4988930d34259d261f1795e2132eda Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 25 Feb 2021 10:17:21 -0600 Subject: [PATCH 048/238] cmake-3.19.6 --- ...FindBoost-Add-support-for-Boost-1.75.patch | 74 ------------------- cmake.spec | 7 +- sources | 2 +- 3 files changed, 5 insertions(+), 78 deletions(-) delete mode 100644 0572-FindBoost-Add-support-for-Boost-1.75.patch diff --git a/0572-FindBoost-Add-support-for-Boost-1.75.patch b/0572-FindBoost-Add-support-for-Boost-1.75.patch deleted file mode 100644 index 75c0bb5..0000000 --- a/0572-FindBoost-Add-support-for-Boost-1.75.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 82930647607d23b118c84194afc3c70d6d8e79e3 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Wed, 3 Feb 2021 12:07:49 -0500 -Subject: [PATCH 572/590] FindBoost: Add support for Boost 1.75 - -Update the list of known versions. - -Run the command - - cmake -DBOOST_DIR=/path/to/boost_1_75_0 \ - -P Utilities/Scripts/BoostScanDeps.cmake - -to extract dependencies from the 1.75.0 source tree. -They differ from 1.74's dependencies by the addition of -dependencies of the json component, so add a new version -block to FindBoost. - -Fixes: #21773 ---- - Modules/FindBoost.cmake | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index 00e4ff1d21..54d9593ca7 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -1186,11 +1186,26 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - set(_Boost_TIMER_DEPENDENCIES chrono) - set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic) - set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) -+ elseif(Boost_VERSION_STRING VERSION_LESS 1.75.0) -+ set(_Boost_CONTRACT_DEPENDENCIES thread chrono date_time) -+ set(_Boost_COROUTINE_DEPENDENCIES context) -+ set(_Boost_FIBER_DEPENDENCIES context) -+ set(_Boost_IOSTREAMS_DEPENDENCIES regex) -+ set(_Boost_LOG_DEPENDENCIES date_time log_setup filesystem thread regex chrono atomic) -+ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic) -+ set(_Boost_MPI_DEPENDENCIES serialization) -+ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization) -+ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version}) -+ set(_Boost_THREAD_DEPENDENCIES chrono date_time atomic) -+ set(_Boost_TIMER_DEPENDENCIES chrono) -+ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic) -+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) - else() - set(_Boost_CONTRACT_DEPENDENCIES thread chrono date_time) - set(_Boost_COROUTINE_DEPENDENCIES context) - set(_Boost_FIBER_DEPENDENCIES context) - set(_Boost_IOSTREAMS_DEPENDENCIES regex) -+ set(_Boost_JSON_DEPENDENCIES container) - set(_Boost_LOG_DEPENDENCIES date_time log_setup filesystem thread regex chrono atomic) - set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic) - set(_Boost_MPI_DEPENDENCIES serialization) -@@ -1200,7 +1215,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - set(_Boost_TIMER_DEPENDENCIES chrono) - set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic) - set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) -- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.75.0) -+ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.76.0) - message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") - endif() - endif() -@@ -1472,7 +1487,7 @@ else() - # _Boost_COMPONENT_HEADERS. See the instructions at the top of - # _Boost_COMPONENT_DEPENDENCIES. - set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} -- "1.74.0" "1.74" -+ "1.75.0" "1.75" "1.74.0" "1.74" - "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" - "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" - "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" --- -2.29.2 - diff --git a/cmake.spec b/cmake.spec index 0081f7f..8e068d6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -77,7 +77,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.4 +Version: %{major_version}.%{minor_version}.6 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -112,8 +112,6 @@ 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.19-CPACK_ARCHIVE_THREADS.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1925355 -Patch104: 0572-FindBoost-Add-support-for-Boost-1.75.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -535,6 +533,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Thu Feb 25 2021 Rex Dieter - 3.19.6-2 +- cmake-3.19.6 + * Sat Feb 06 2021 Rex Dieter - 3.19.4-2 - CMake warning when searching for Boost 1.75 (#1925355) diff --git a/sources b/sources index aacd71b..8a64cd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.19.4.tar.gz) = e2781479d2185f8f927439b795120a0f4957e9da7730804ff8ec06d6bbe75a0069e49d95e642706179520a7229ae82e53bab891fa8cfd859913c0cb5fd4e843f +SHA512 (cmake-3.19.6.tar.gz) = 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9 From ec77e26a430f453cc58eb33fc5a7b593d88e6e81 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 15 Mar 2021 15:05:56 -0500 Subject: [PATCH 049/238] cmake-3.19.7 --- cmake.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 8e068d6..934a9f1 100644 --- a/cmake.spec +++ b/cmake.spec @@ -70,14 +70,14 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%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}.6 +Version: %{major_version}.%{minor_version}.7 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -533,6 +533,9 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Mon Mar 15 2021 Rex Dieter - 3.19.7-1 +- cmake-3.19.7 + * Thu Feb 25 2021 Rex Dieter - 3.19.6-2 - cmake-3.19.6 diff --git a/sources b/sources index 8a64cd4..f4d5542 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.19.6.tar.gz) = 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9 +SHA512 (cmake-3.19.7.tar.gz) = 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a From c50f9727e8643f66a4b72949b6b03f39df048399 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 30 Apr 2021 09:19:23 -0500 Subject: [PATCH 050/238] cmake-3.20.2 (#1942118) bash-completion fixes (#1924340) Release build type optimization options differ from upstream package (#1751155) parse parallel build from %_smp_mflags instead of _NPROCESSORS_ONLN drop old dist references (rhel6) --- cmake-3.19-CPACK_ARCHIVE_THREADS.patch | 11 ------ cmake-3.20-CPACK_THREADS.patch | 11 ++++++ cmake-fedora-flag_release.patch | 52 -------------------------- cmake.spec | 49 +++++++++++------------- sources | 2 +- 5 files changed, 33 insertions(+), 92 deletions(-) delete mode 100644 cmake-3.19-CPACK_ARCHIVE_THREADS.patch create mode 100644 cmake-3.20-CPACK_THREADS.patch diff --git a/cmake-3.19-CPACK_ARCHIVE_THREADS.patch b/cmake-3.19-CPACK_ARCHIVE_THREADS.patch deleted file mode 100644 index bdf99a3..0000000 --- a/cmake-3.19-CPACK_ARCHIVE_THREADS.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up cmake-3.19.2/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake.CPACK_ARCHIVE_THREADS cmake-3.19.2/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake ---- cmake-3.19.2/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake.CPACK_ARCHIVE_THREADS 2020-12-16 06:35:29.000000000 -0600 -+++ cmake-3.19.2/Tests/RunCMake/CPack/tests/THREADED_ALL/test.cmake 2021-01-12 16:47:40.139581556 -0600 -@@ -1,6 +1,6 @@ - install(FILES CMakeLists.txt DESTINATION foo COMPONENT test) - --set(CPACK_ARCHIVE_THREADS 0) -+set(CPACK_ARCHIVE_THREADS 4) - - if(PACKAGING_TYPE STREQUAL "COMPONENT") - set(CPACK_COMPONENTS_ALL test) diff --git a/cmake-3.20-CPACK_THREADS.patch b/cmake-3.20-CPACK_THREADS.patch new file mode 100644 index 0000000..354f585 --- /dev/null +++ b/cmake-3.20-CPACK_THREADS.patch @@ -0,0 +1,11 @@ +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-fedora-flag_release.patch b/cmake-fedora-flag_release.patch index 7b1ad64..93be92e 100644 --- a/cmake-fedora-flag_release.patch +++ b/cmake-fedora-flag_release.patch @@ -101,58 +101,6 @@ Index: cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt") if(CMAKE_HOST_WIN32) -Index: cmake-3.17.0-rc1/Modules/Compiler/SunPro-ASM.cmake -=================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-ASM.cmake -+++ cmake-3.17.0-rc1/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.0-rc1/Modules/Compiler/SunPro-C.cmake -=================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-C.cmake -+++ cmake-3.17.0-rc1/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.0-rc1/Modules/Compiler/SunPro-CXX.cmake -=================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-CXX.cmake -+++ cmake-3.17.0-rc1/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.0-rc1/Modules/Compiler/SunPro-Fortran.cmake -=================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Compiler/SunPro-Fortran.cmake -+++ cmake-3.17.0-rc1/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.0-rc1/Modules/Platform/Windows-Clang.cmake =================================================================== --- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-Clang.cmake diff --git a/cmake.spec b/cmake.spec index 934a9f1..3b882c3 100644 --- a/cmake.spec +++ b/cmake.spec @@ -32,12 +32,7 @@ # Enable RPM dependency generators for cmake files written in Python %bcond_without rpm -# Sphinx-build cannot import CMakeLexer on EPEL <= 6 -%if 0%{?rhel} && 0%{?rhel} <= 6 -%bcond_with sphinx -%else %bcond_without sphinx -%endif %if !0%{?rhel} %bcond_with bundled_jsoncpp @@ -63,7 +58,7 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 19 +%global minor_version 20 # Set to RC version if building RC, else %%{nil} #global rcsuf rc1 %{?rcsuf:%global relsuf .%{rcsuf}} @@ -77,7 +72,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.7 +Version: %{major_version}.%{minor_version}.2 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -105,20 +100,19 @@ Source5: %{name}.req # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch # replace release flag -O3 with -O2 for fedora +%if 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.19-CPACK_ARCHIVE_THREADS.patch +Patch103: cmake-3.20-CPACK_THREADS.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} Patch1: %{name}-rename.patch -%if 0%{?rhel} && 0%{?rhel} <= 6 -Patch2: %{name}-libarchive3.patch -%endif %endif BuildRequires: coreutils @@ -177,7 +171,6 @@ BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python2-devel %endif %endif -#BuildRequires: xmlrpc-c-devel %if %{with gui} %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: pkgconfig(Qt5Widgets) @@ -187,6 +180,9 @@ BuildRequires: pkgconfig(QtGui) BuildRequires: desktop-file-utils %endif +BuildRequires: pkgconfig(bash-completion) +%global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '%{_datadir}/bash-completion/completions') + %if %{without bootstrap} # Ensure we have our own rpm-macros in place during build. BuildRequires: %{name}-rpm-macros @@ -309,7 +305,7 @@ pushd %{_vpath_builddir} $SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \ --docdir=/share/doc/%{name} --mandir=/share/man \ --%{?with_bootstrap:no-}system-libs \ - --parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \ + --parallel="$(echo %{?_smp_mflags} | sed -e 's|-j||g')" \ %if %{with bundled_rhash} --no-system-librhash \ %endif @@ -336,12 +332,7 @@ find %{buildroot}%{_datadir}/%{name}/Modules -type f | xargs chmod -x exit 1 # Install major_version name links %{!?name_suffix:for f in ccmake cmake cpack ctest; do ln -s $f %{buildroot}%{_bindir}/${f}%{major_version}; done} -# Install bash completion symlinks -mkdir -p %{buildroot}%{_datadir}/bash-completion/completions -for f in %{buildroot}%{_datadir}/%{name}/completions/* -do - ln -s ../../%{name}/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions -done + %if %{with emacs} # Install emacs cmake mode mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name} %{buildroot}%{_emacs_sitestartdir} @@ -444,13 +435,10 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \ %if %{with test} %check -%if 0%{?rhel} && 0%{?rhel} <= 6 -mv -f Modules/FindLibArchive.cmake Modules/FindLibArchive.disabled -%endif pushd %{_vpath_builddir} # CTestTestUpload require internet access # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983 -NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup" +NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup|CPack_RPM.DEBUGINFO" # kwsys.testProcess-{4,5} are flaky on s390x. %ifarch s390x NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" @@ -460,12 +448,10 @@ NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" NO_TEST="$NO_TEST|curl" %endif bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure +## do this only periodically, not for every build -- rdieter 20210429 # Keep an eye on failing tests -bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || : +#bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || : popd -%if 0%{?rhel} && 0%{?rhel} <= 6 -mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake -%endif %endif @@ -484,7 +470,7 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %files data -f data_files.mf %{_datadir}/aclocal/%{name}.m4 -%{_datadir}/bash-completion +%{bash_completionsdir}/c* %if %{with emacs} %if 0%{?fedora} || 0%{?rhel} >= 7 %{_emacs_sitelispdir}/%{name} @@ -533,6 +519,13 @@ mv -f Modules/FindLibArchive.disabled Modules/FindLibArchive.cmake %changelog +* Thu Apr 29 2021 Rex Dieter - 3.20.2-1 +- cmake-3.20.2 (#1942118) +- bash-completion fixes (#1924340) +- Release build type optimization options differ from upstream package (#1751155) +- parse parallel build from %%_smp_mflags instead of _NPROCESSORS_ONLN +- drop old dist references (rhel6) + * Mon Mar 15 2021 Rex Dieter - 3.19.7-1 - cmake-3.19.7 diff --git a/sources b/sources index f4d5542..1d54751 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.19.7.tar.gz) = 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a +SHA512 (cmake-3.20.2.tar.gz) = 675a92f84b437169aee86dbfa59715671b9195ddeffc6fea83c7803a70abe3116106ad0a627b9e4bef326bfb2a10fdf624ad341fd9d3d08e3d8a69c271cd2b32 From 759f15949a2838c643933723fa1c77771ea75509 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 30 May 2021 22:06:22 -0500 Subject: [PATCH 051/238] cmake-3.20.3 --- cmake.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 3b882c3..9199a2c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.2 +Version: %{major_version}.%{minor_version}.3 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -519,6 +519,9 @@ popd %changelog +* Sun May 30 2021 Rex Dieter - 3.20.3-1 +- cmake-3.20.3 + * Thu Apr 29 2021 Rex Dieter - 3.20.2-1 - cmake-3.20.2 (#1942118) - bash-completion fixes (#1924340) diff --git a/sources b/sources index 1d54751..66b6b00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.20.2.tar.gz) = 675a92f84b437169aee86dbfa59715671b9195ddeffc6fea83c7803a70abe3116106ad0a627b9e4bef326bfb2a10fdf624ad341fd9d3d08e3d8a69c271cd2b32 +SHA512 (cmake-3.20.3.tar.gz) = ed2b8b04c759c4f7c5c363be33bf08e6677c710c1f937050a378ab5539136b919531e1c927b117b3d8d68d4bb613de8d92a3d4d50f3ab3bc98355febca779a1b From 58d72bbcee57d376a4442baadd2bbe28995fd14b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 18 Jun 2021 12:56:28 -0500 Subject: [PATCH 052/238] cmake-3.20.4 (#1942118) --- cmake.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 9199a2c..e19b767 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.3 +Version: %{major_version}.%{minor_version}.4 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -519,6 +519,9 @@ popd %changelog +* Fri Jun 18 2021 Rex Dieter - 3.20.4-1 +- cmake-3.20.4 (#1942118) + * Sun May 30 2021 Rex Dieter - 3.20.3-1 - cmake-3.20.3 diff --git a/sources b/sources index 66b6b00..0510c26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.20.3.tar.gz) = ed2b8b04c759c4f7c5c363be33bf08e6677c710c1f937050a378ab5539136b919531e1c927b117b3d8d68d4bb613de8d92a3d4d50f3ab3bc98355febca779a1b +SHA512 (cmake-3.20.4.tar.gz) = f53902a917b8d7b949af305afed3b32fcf981c5c647a77ee7a3bcae1bb5620381a1eacdac4b86bd7e5ea0a7806ec5fbd9a4f4853553f78db4d41d7dd2867c99f From f52c15acca5c2d43cf386b0491ba9df0704d6f99 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 18 Jun 2021 15:06:54 -0500 Subject: [PATCH 053/238] workaround libdl-related FTBFS (#1972535) --- cmake-3.20.4-glibc_libdl.patch | 28 ++++++++++++++++++++++++++++ cmake.spec | 5 +++++ 2 files changed, 33 insertions(+) create mode 100644 cmake-3.20.4-glibc_libdl.patch diff --git a/cmake-3.20.4-glibc_libdl.patch b/cmake-3.20.4-glibc_libdl.patch new file mode 100644 index 0000000..1c90af4 --- /dev/null +++ b/cmake-3.20.4-glibc_libdl.patch @@ -0,0 +1,28 @@ +diff -up cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx.libdl cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx +--- cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx.libdl 2021-06-14 10:05:49.000000000 -0500 ++++ cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx 2021-06-18 14:17:50.990852438 -0500 +@@ -8,6 +8,13 @@ + # include /* disable_debugger() API. */ + #endif + ++#ifdef __linux__ ++#include ++#ifndef LIBDL_SO ++#define LIBDL_SO "libdl.so.2" ++#endif ++#endif ++ + // Work-around CMake dependency scanning limitation. This must + // duplicate the above list of headers. + #if 0 +@@ -107,8 +114,8 @@ int testDynamicLoader(int argc, char* ar + // This one is actually fun to test, since dlopen is by default + // loaded...wonder why :) + res += TestDynamicLoader("foobar.lib", "dlopen", 0, 1, 0); +- res += TestDynamicLoader("libdl.so", "dlopen", 1, 1, 1); +- res += TestDynamicLoader("libdl.so", "TestDynamicLoader", 1, 0, 1); ++ res += TestDynamicLoader(LIBDL_SO, "dlopen", 1, 1, 1); ++ res += TestDynamicLoader(LIBDL_SO, "TestDynamicLoader", 1, 0, 1); + #endif + // Now try on the generated library + std::string libname = GetLibName(KWSYS_NAMESPACE_STRING "TestDynload"); diff --git a/cmake.spec b/cmake.spec index e19b767..5933149 100644 --- a/cmake.spec +++ b/cmake.spec @@ -109,6 +109,10 @@ 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 +# (upstreamable) +# https://bugzilla.redhat.com/show_bug.cgi?id=1972535 +# fix FTBFS +Patch104: cmake-3.20.4-glibc_libdl.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -521,6 +525,7 @@ popd %changelog * Fri Jun 18 2021 Rex Dieter - 3.20.4-1 - cmake-3.20.4 (#1942118) +- workaround libdl-related FTBFS (#1972535) * Sun May 30 2021 Rex Dieter - 3.20.3-1 - cmake-3.20.3 From cc03ad334fea0b8abd6d8eccc89b5c3aea051bb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 21 Jun 2021 20:39:51 +0200 Subject: [PATCH 054/238] cmake-3.20.5 (#1942118) --- cmake.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 5933149..e0e0af9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.4 +Version: %{major_version}.%{minor_version}.5 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -523,6 +523,9 @@ popd %changelog +* Mon Jun 21 2021 Björn Esser - 3.20.5-1 +- cmake-3.20.5 (#1942118) + * Fri Jun 18 2021 Rex Dieter - 3.20.4-1 - cmake-3.20.4 (#1942118) - workaround libdl-related FTBFS (#1972535) diff --git a/sources b/sources index 0510c26..8987824 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.20.4.tar.gz) = f53902a917b8d7b949af305afed3b32fcf981c5c647a77ee7a3bcae1bb5620381a1eacdac4b86bd7e5ea0a7806ec5fbd9a4f4853553f78db4d41d7dd2867c99f +SHA512 (cmake-3.20.5.tar.gz) = 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008 From e2873452a24b2e36504672c9abe23728d2f3a0fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 23 Jun 2021 20:06:35 +0200 Subject: [PATCH 055/238] cmake-3.21.0-rc1 (#1975377) --- cmake-3.20-CPACK_THREADS.patch | 11 ----------- cmake.spec | 16 ++++++++-------- sources | 2 +- 3 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 cmake-3.20-CPACK_THREADS.patch 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.spec b/cmake.spec index e0e0af9..ad3bf51 100644 --- a/cmake.spec +++ b/cmake.spec @@ -58,9 +58,9 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 20 +%global minor_version 21 # Set to RC version if building RC, else %%{nil} -#global rcsuf rc1 +%global rcsuf rc1 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} @@ -72,7 +72,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.5 +Version: %{major_version}.%{minor_version}.0 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -106,13 +106,10 @@ Patch101: %{name}-fedora-flag_release.patch # 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 # (upstreamable) # https://bugzilla.redhat.com/show_bug.cgi?id=1972535 # fix FTBFS -Patch104: cmake-3.20.4-glibc_libdl.patch +Patch103: %{name}-3.20.4-glibc_libdl.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -442,7 +439,7 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \ pushd %{_vpath_builddir} # CTestTestUpload require internet access # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983 -NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup|CPack_RPM.DEBUGINFO" +NO_TEST="CTestTestUpload" # kwsys.testProcess-{4,5} are flaky on s390x. %ifarch s390x NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" @@ -523,6 +520,9 @@ popd %changelog +* Wed Jun 23 2021 Björn Esser - 3.21.0-1.rc1 +- cmake-3.21.0-rc1 (#1975377) + * Mon Jun 21 2021 Björn Esser - 3.20.5-1 - cmake-3.20.5 (#1942118) diff --git a/sources b/sources index 8987824..a6a4a13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.20.5.tar.gz) = 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008 +SHA512 (cmake-3.21.0-rc1.tar.gz) = 91607aacd76fe53a146c23119d07c6eb9f91bdddc0c30498fd43786f3347f67cd4a2d51f76ec3b5d7849a9b4d6beddeec4ef2249ca981493a9b2581309cd1ef3 From 4bee260a3330d0dc0c14d79149390db19a212b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 23 Jun 2021 21:33:37 +0200 Subject: [PATCH 056/238] Update cmake-3.20.4-glibc_libdl.patch --- cmake-3.20.4-glibc_libdl.patch | 43 +++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/cmake-3.20.4-glibc_libdl.patch b/cmake-3.20.4-glibc_libdl.patch index 1c90af4..7bd5c34 100644 --- a/cmake-3.20.4-glibc_libdl.patch +++ b/cmake-3.20.4-glibc_libdl.patch @@ -1,21 +1,46 @@ -diff -up cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx.libdl cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx ---- cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx.libdl 2021-06-14 10:05:49.000000000 -0500 -+++ cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx 2021-06-18 14:17:50.990852438 -0500 -@@ -8,6 +8,13 @@ +From 635ab930f6185d1ec3e4d99109e2edf0533b0d00 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Wed, 23 Jun 2021 21:03:15 +0200 +Subject: [PATCH] testDynamicLoader: Use LIBDL_SO macro if defined. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Starting with glibc v2.34 there is no external version of libdl.so +anymore. It has been merged into the glibc libc.so. + +Assuming libdl.so will be present will break the test, thus the +LIBDL_SO macro should be used. If the macro is not defined on +the system, we ensure it will be defined using the previously +hardcoded value. + +Signed-off-by: Björn Esser +--- + cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/testDynamicLoader.cxx b/testDynamicLoader.cxx +index 703ad4d..55a671b 100644 +--- cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx.libdl ++++ cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx +@@ -8,6 +8,16 @@ # include /* disable_debugger() API. */ #endif ++// Will define LIBDL_SO macro on Linux systems. +#ifdef __linux__ -+#include -+#ifndef LIBDL_SO -+#define LIBDL_SO "libdl.so.2" ++# include +#endif ++ ++// Define the LIBDL_SO macro, if not defined above. ++#ifndef LIBDL_SO ++# define LIBDL_SO "libdl.so" +#endif + // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 -@@ -107,8 +114,8 @@ int testDynamicLoader(int argc, char* ar +@@ -107,8 +117,8 @@ int testDynamicLoader(int argc, char* argv[]) // This one is actually fun to test, since dlopen is by default // loaded...wonder why :) res += TestDynamicLoader("foobar.lib", "dlopen", 0, 1, 0); @@ -26,3 +51,5 @@ diff -up cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx.libdl cmake-3.20.4/Sour #endif // Now try on the generated library std::string libname = GetLibName(KWSYS_NAMESPACE_STRING "TestDynload"); +-- +2.31.1 From b5ab4110144a3e0d9d55a0a65c51748ad66e0968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 28 Jun 2021 22:57:35 +0200 Subject: [PATCH 057/238] Update cmake-3.20.4-glibc_libdl.patch with upstreamed version --- cmake-3.20.4-glibc_libdl.patch | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/cmake-3.20.4-glibc_libdl.patch b/cmake-3.20.4-glibc_libdl.patch index 7bd5c34..398a332 100644 --- a/cmake-3.20.4-glibc_libdl.patch +++ b/cmake-3.20.4-glibc_libdl.patch @@ -19,17 +19,26 @@ Signed-off-by: Björn Esser cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -diff --git a/testDynamicLoader.cxx b/testDynamicLoader.cxx -index 703ad4d..55a671b 100644 ---- cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx.libdl -+++ cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx -@@ -8,6 +8,16 @@ +Index: cmake-3.21.0-rc1/Source/kwsys/testDynamicLoader.cxx +=================================================================== +--- cmake-3.21.0-rc1.orig/Source/kwsys/testDynamicLoader.cxx ++++ cmake-3.21.0-rc1/Source/kwsys/testDynamicLoader.cxx +@@ -8,6 +8,25 @@ # include /* disable_debugger() API. */ #endif -+// Will define LIBDL_SO macro on Linux systems. ++// Needed for __GLIBC__ test macro. +#ifdef __linux__ ++# include ++#endif ++ ++// Will define LIBDL_SO macro on systems with glibc. ++#ifdef __GLIBC__ +# include ++// Define to LIBC_SO, if not defined by above header. ++# ifndef LIBDL_SO ++# define LIBDL_SO LIBC_SO ++# endif +#endif + +// Define the LIBDL_SO macro, if not defined above. @@ -40,7 +49,7 @@ index 703ad4d..55a671b 100644 // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 -@@ -107,8 +117,8 @@ int testDynamicLoader(int argc, char* argv[]) +@@ -107,8 +126,8 @@ int testDynamicLoader(int argc, char* ar // This one is actually fun to test, since dlopen is by default // loaded...wonder why :) res += TestDynamicLoader("foobar.lib", "dlopen", 0, 1, 0); @@ -51,5 +60,3 @@ index 703ad4d..55a671b 100644 #endif // Now try on the generated library std::string libname = GetLibName(KWSYS_NAMESPACE_STRING "TestDynload"); --- -2.31.1 From 982fc376fe33280c26ac61c5b6782b3fdd957e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 29 Jun 2021 14:18:29 +0200 Subject: [PATCH 058/238] Rebuilt with upstreamed cmake-3.20.4-glibc_libdl.patch --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index ad3bf51..9ef7537 100644 --- a/cmake.spec +++ b/cmake.spec @@ -65,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} @@ -520,6 +520,9 @@ popd %changelog +* Tue Jun 29 2021 Björn Esser - 3.21.0-2.rc1 +- Rebuilt with upstreamed cmake-3.20.4-glibc_libdl.patch + * Wed Jun 23 2021 Björn Esser - 3.21.0-1.rc1 - cmake-3.21.0-rc1 (#1975377) From e096c7c3fdafe3bcdf29b0765756eded065c7bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 5 Jul 2021 21:47:46 +0200 Subject: [PATCH 059/238] cmake-3.21.0-rc2 --- cmake.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 9ef7537..d7384d5 100644 --- a/cmake.spec +++ b/cmake.spec @@ -60,12 +60,12 @@ %global major_version 3 %global minor_version 21 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc1 +%global rcsuf rc2 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -520,6 +520,9 @@ popd %changelog +* Mon Jul 05 2021 Björn Esser - 3.21.0-3.rc2 +- cmake-3.21.0-rc2 + * Tue Jun 29 2021 Björn Esser - 3.21.0-2.rc1 - Rebuilt with upstreamed cmake-3.20.4-glibc_libdl.patch diff --git a/sources b/sources index a6a4a13..458ac14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.21.0-rc1.tar.gz) = 91607aacd76fe53a146c23119d07c6eb9f91bdddc0c30498fd43786f3347f67cd4a2d51f76ec3b5d7849a9b4d6beddeec4ef2249ca981493a9b2581309cd1ef3 +SHA512 (cmake-3.21.0-rc2.tar.gz) = 52090e700ed10cba70bcb2d4a2480e9513e5c0a0f0773d9c8d4b25e1d1dec9203f91907f634fe83b6443048a53c6c78ff903bb7d1f981bf5faf58bc970e7ffa6 From 1d2c31f13f25c84f3a72ca04aeffed805d4863b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 5 Jul 2021 21:54:08 +0200 Subject: [PATCH 060/238] Drop libdl patch for glibc >= 2.34, as it is upstreamed --- cmake-3.20.4-glibc_libdl.patch | 62 ---------------------------------- cmake.spec | 5 +-- 2 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 cmake-3.20.4-glibc_libdl.patch diff --git a/cmake-3.20.4-glibc_libdl.patch b/cmake-3.20.4-glibc_libdl.patch deleted file mode 100644 index 398a332..0000000 --- a/cmake-3.20.4-glibc_libdl.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 635ab930f6185d1ec3e4d99109e2edf0533b0d00 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Wed, 23 Jun 2021 21:03:15 +0200 -Subject: [PATCH] testDynamicLoader: Use LIBDL_SO macro if defined. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Starting with glibc v2.34 there is no external version of libdl.so -anymore. It has been merged into the glibc libc.so. - -Assuming libdl.so will be present will break the test, thus the -LIBDL_SO macro should be used. If the macro is not defined on -the system, we ensure it will be defined using the previously -hardcoded value. - -Signed-off-by: Björn Esser ---- - cmake-3.20.4/Source/kwsys/testDynamicLoader.cxx | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -Index: cmake-3.21.0-rc1/Source/kwsys/testDynamicLoader.cxx -=================================================================== ---- cmake-3.21.0-rc1.orig/Source/kwsys/testDynamicLoader.cxx -+++ cmake-3.21.0-rc1/Source/kwsys/testDynamicLoader.cxx -@@ -8,6 +8,25 @@ - # include /* disable_debugger() API. */ - #endif - -+// Needed for __GLIBC__ test macro. -+#ifdef __linux__ -+# include -+#endif -+ -+// Will define LIBDL_SO macro on systems with glibc. -+#ifdef __GLIBC__ -+# include -+// Define to LIBC_SO, if not defined by above header. -+# ifndef LIBDL_SO -+# define LIBDL_SO LIBC_SO -+# endif -+#endif -+ -+// Define the LIBDL_SO macro, if not defined above. -+#ifndef LIBDL_SO -+# define LIBDL_SO "libdl.so" -+#endif -+ - // Work-around CMake dependency scanning limitation. This must - // duplicate the above list of headers. - #if 0 -@@ -107,8 +126,8 @@ int testDynamicLoader(int argc, char* ar - // This one is actually fun to test, since dlopen is by default - // loaded...wonder why :) - res += TestDynamicLoader("foobar.lib", "dlopen", 0, 1, 0); -- res += TestDynamicLoader("libdl.so", "dlopen", 1, 1, 1); -- res += TestDynamicLoader("libdl.so", "TestDynamicLoader", 1, 0, 1); -+ res += TestDynamicLoader(LIBDL_SO, "dlopen", 1, 1, 1); -+ res += TestDynamicLoader(LIBDL_SO, "TestDynamicLoader", 1, 0, 1); - #endif - // Now try on the generated library - std::string libname = GetLibName(KWSYS_NAMESPACE_STRING "TestDynload"); diff --git a/cmake.spec b/cmake.spec index d7384d5..e06d84c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -106,10 +106,6 @@ Patch101: %{name}-fedora-flag_release.patch # Add dl to CMAKE_DL_LIBS on MINGW # https://gitlab.kitware.com/cmake/cmake/issues/17600 Patch102: %{name}-mingw-dl.patch -# (upstreamable) -# https://bugzilla.redhat.com/show_bug.cgi?id=1972535 -# fix FTBFS -Patch103: %{name}-3.20.4-glibc_libdl.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -522,6 +518,7 @@ popd %changelog * Mon Jul 05 2021 Björn Esser - 3.21.0-3.rc2 - cmake-3.21.0-rc2 +- Drop libdl patch for glibc >= 2.34, as it is upstreamed * Tue Jun 29 2021 Björn Esser - 3.21.0-2.rc1 - Rebuilt with upstreamed cmake-3.20.4-glibc_libdl.patch From c1d581dd94c90ab0357efafc85ea4bc94bd88515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 8 Jul 2021 20:37:57 +0200 Subject: [PATCH 061/238] cmake-3.21.0-rc3 --- cmake.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index e06d84c..7813f07 100644 --- a/cmake.spec +++ b/cmake.spec @@ -60,12 +60,12 @@ %global major_version 3 %global minor_version 21 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc2 +%global rcsuf rc3 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -516,6 +516,9 @@ popd %changelog +* Thu Jul 08 2021 Björn Esser - 3.21.0-4.rc3 +- cmake-3.21.0-rc3 + * Mon Jul 05 2021 Björn Esser - 3.21.0-3.rc2 - cmake-3.21.0-rc2 - Drop libdl patch for glibc >= 2.34, as it is upstreamed diff --git a/sources b/sources index 458ac14..6c2f013 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.21.0-rc2.tar.gz) = 52090e700ed10cba70bcb2d4a2480e9513e5c0a0f0773d9c8d4b25e1d1dec9203f91907f634fe83b6443048a53c6c78ff903bb7d1f981bf5faf58bc970e7ffa6 +SHA512 (cmake-3.21.0-rc3.tar.gz) = fb0d3eadde91acafeb446e12aebd9228be2ebae978d0e33cf417fdd00ed7361a99b7397568a3b12c0fdf06122ae556592eecbdfef6fc540db45ccf4974011844 From 4426da220ff9b9af3b0cdef4b7a26a8eb80119a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 15 Jul 2021 12:02:36 +0200 Subject: [PATCH 062/238] cmake-3.21.0 --- cmake.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 7813f07..7588f98 100644 --- a/cmake.spec +++ b/cmake.spec @@ -60,12 +60,12 @@ %global major_version 3 %global minor_version 21 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc3 +#global rcsuf rc1 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 4 +%global baserelease 5 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -516,6 +516,9 @@ popd %changelog +* Thu Jul 15 2021 Björn Esser - 3.21.0-5 +- cmake-3.21.0 + * Thu Jul 08 2021 Björn Esser - 3.21.0-4.rc3 - cmake-3.21.0-rc3 diff --git a/sources b/sources index 6c2f013..10cfa61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.21.0-rc3.tar.gz) = fb0d3eadde91acafeb446e12aebd9228be2ebae978d0e33cf417fdd00ed7361a99b7397568a3b12c0fdf06122ae556592eecbdfef6fc540db45ccf4974011844 +SHA512 (cmake-3.21.0.tar.gz) = b635c50db0d3a18392a84b24f14017bb625708bcc6f6ba2d749a5c37d45f5e0565e415a802d129090a18e0747f80f2640747650d28fa0b3069d28e3e6a735ebc From 52aebae41c382a2d19f3f840b529f83e2426768c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 14:42:48 +0000 Subject: [PATCH 063/238] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From ed5ec6c0ce13519ccb9dd87ad18dc834a341d4ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 19:40:26 +0000 Subject: [PATCH 064/238] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 7588f98..6fc5d74 100644 --- a/cmake.spec +++ b/cmake.spec @@ -65,7 +65,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 5 +%global baserelease 6 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -516,6 +516,9 @@ popd %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 3.21.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jul 15 2021 Björn Esser - 3.21.0-5 - cmake-3.21.0 From c6ce53bc36ab6cf806e26bb0c70fd3fdfcd45747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 27 Jul 2021 18:06:31 +0200 Subject: [PATCH 065/238] cmake-3.21.1 Fixes rhbz#1986449 --- cmake.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 6fc5d74..4858d2c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -65,14 +65,14 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 6 +%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}.0 +Version: %{major_version}.%{minor_version}.1 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -516,6 +516,10 @@ popd %changelog +* Tue Jul 27 2021 Björn Esser - 3.21.1-1 +- cmake-3.21.1 + Fixes rhbz#1986449 + * Wed Jul 21 2021 Fedora Release Engineering - 3.21.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 10cfa61..337b18b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.21.0.tar.gz) = b635c50db0d3a18392a84b24f14017bb625708bcc6f6ba2d749a5c37d45f5e0565e415a802d129090a18e0747f80f2640747650d28fa0b3069d28e3e6a735ebc +SHA512 (cmake-3.21.1.tar.gz) = 1453b1f5139950f501c570c305257e4e5dacb8224944de8ed1489aae162c6dd75fe1cd5188d619c47e4e53ca5b846f07318ffb3ab004a0547f2c8b13f60083b4 From d2c731e954c96dacf3432486103b70bf1c3b94cd Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Tue, 20 Apr 2021 11:26:00 +0000 Subject: [PATCH 066/238] init FMF CI gating --- .fmf/version | 1 + gating.yaml | 22 +++++++ plans/ci.fmf | 6 ++ tests/cmake-testsuite-sanity/Makefile | 63 ++++++++++++++++++ tests/cmake-testsuite-sanity/PURPOSE | 3 + tests/cmake-testsuite-sanity/main.fmf | 15 +++++ tests/cmake-testsuite-sanity/runtest.sh | 85 +++++++++++++++++++++++++ tests/cmake-testsuite-sanity/tests | 85 +++++++++++++++++++++++++ 8 files changed, 280 insertions(+) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/ci.fmf create mode 100644 tests/cmake-testsuite-sanity/Makefile create mode 100644 tests/cmake-testsuite-sanity/PURPOSE create mode 100644 tests/cmake-testsuite-sanity/main.fmf create mode 100755 tests/cmake-testsuite-sanity/runtest.sh create mode 100644 tests/cmake-testsuite-sanity/tests diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..9d32f2a --- /dev/null +++ b/gating.yaml @@ -0,0 +1,22 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation} +--- !Policy +product_versions: + - rhel-8 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional +baseos-ci.brew-build.tier1.functional} +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional +baseos-ci.brew-build.tier1.functional} diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..1ad2c12 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,6 @@ +summary: CI Gating Plan +discover: + how: fmf + directory: tests +execute: + how: beakerlib diff --git a/tests/cmake-testsuite-sanity/Makefile b/tests/cmake-testsuite-sanity/Makefile new file mode 100644 index 0000000..1202d64 --- /dev/null +++ b/tests/cmake-testsuite-sanity/Makefile @@ -0,0 +1,63 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /tools/cmake/Sanity/cmake-testsuite-sanity +# Description: cmake testing by upstream testsuite +# Author: Michal Kolar +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2021 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/tools/cmake/Sanity/cmake-testsuite-sanity +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE tests + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + test -x runtest.sh || chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Michal Kolar " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: cmake testing by upstream testsuite" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 1h" >> $(METADATA) + @echo "RunFor: cmake" >> $(METADATA) + @echo "Requires: cmake dnf-utils rpm-build" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2+" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7 -RHEL8" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/cmake-testsuite-sanity/PURPOSE b/tests/cmake-testsuite-sanity/PURPOSE new file mode 100644 index 0000000..21b627e --- /dev/null +++ b/tests/cmake-testsuite-sanity/PURPOSE @@ -0,0 +1,3 @@ +PURPOSE of /tools/cmake/Sanity/cmake-testsuite-sanity +Description: cmake testing by upstream testsuite +Author: Michal Kolar diff --git a/tests/cmake-testsuite-sanity/main.fmf b/tests/cmake-testsuite-sanity/main.fmf new file mode 100644 index 0000000..298b6e2 --- /dev/null +++ b/tests/cmake-testsuite-sanity/main.fmf @@ -0,0 +1,15 @@ +summary: cmake testing by upstream testsuite +description: '' +contact: +- Michal Kolar +component: +- cmake +test: ./runtest.sh +framework: beakerlib +recommend: +- cmake +- dnf-utils +- rpm-build +duration: 1h +extra-summary: /tools/cmake/Sanity/cmake-testsuite-sanity +extra-task: /tools/cmake/Sanity/cmake-testsuite-sanity diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh new file mode 100755 index 0000000..d76fdc0 --- /dev/null +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -0,0 +1,85 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /tools/cmake/Sanity/cmake-testsuite-sanity +# Description: cmake testing by upstream testsuite +# Author: Michal Kolar +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2021 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +BUILD_USER=${BUILD_USER:-cmkbld} +TESTS_COUNT_MIN=${TESTS_COUNT_MIN:-50} +PACKAGE="cmake" +REQUIRES="$PACKAGE rpm-build" +if rlIsFedora; then + REQUIRES="$REQUIRES dnf-utils" +else + REQUIRES="$REQUIRES yum-utils" +fi + +rlJournalStart + rlPhaseStartSetup + rlShowRunningKernel + rlAssertRpm --all + rlRun "TmpDir=`mktemp -d`" + rlRun "cp tests $TmpDir" + rlRun "pushd $TmpDir" + rlFetchSrcForInstalled $PACKAGE + rlRun "useradd -M -N $BUILD_USER" 0,9 + [ "$?" == "0" ] && rlRun "del=yes" + rlRun "chown -R $BUILD_USER:users $TmpDir" + rlPhaseEnd + + rlPhaseStartSetup "build cmake" + rlRun "rpm -D \"_topdir $TmpDir\" -U *.src.rpm" + rlRun "dnf builddep -y $TmpDir/SPECS/*.spec" + rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" + rlRun "rlFileSubmit $TmpDir/rpmbuild.log" + rlRun "cd $TmpDir/BUILD/cmake*" + rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER" + rlRun "rlFileSubmit $TmpDir/bootstrap.log" + rlRun "ln -s /usr/bin/cmake bin/cmake" + rlPhaseEnd + + rlPhaseStartTest "run testsuite" + while read test; do + rlRun "su -c '/usr/bin/ctest -R \"$test\" &>>$TmpDir/testsuite.log' $BUILD_USER" + done <$TmpDir/tests + rlRun "rlFileSubmit $TmpDir/testsuite.log" + rlPhaseEnd + + rlPhaseStartTest "evaluate results" + rlRun "cd $TmpDir" + rlRun "grep -E '\*\*\*(F|f)ailed' testsuite.log" 1 "There should be no failure" + rlRun "tests_count=\$(grep -E 'Test #[0-9]+: .+\.\.\. (P|p)assed' testsuite.log | wc -l)" + [ "$tests_count" -ge "$TESTS_COUNT_MIN" ] && rlLogInfo "Test counter: $tests_count" || rlFail "Test counter $tests_count should be greater than or equal to $TESTS_COUNT_MIN" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $TmpDir" + [ "$del" == "yes" ] && rlRun "userdel -f $BUILD_USER" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd diff --git a/tests/cmake-testsuite-sanity/tests b/tests/cmake-testsuite-sanity/tests new file mode 100644 index 0000000..5f9ae48 --- /dev/null +++ b/tests/cmake-testsuite-sanity/tests @@ -0,0 +1,85 @@ +RunCMake.CMakeRoleGlobalProperty +RunCMake.CompilerChange +RunCMake.CompilerNotFound +RunCMake.DisallowedCommands +RunCMake.ExportCompileCommands +RunCMake.ExcludeFromAll +RunCMake.ExternalData +RunCMake.FeatureSummary +RunCMake.GeneratorInstance +RunCMake.GeneratorPlatform +RunCMake.GeneratorToolset +RunCMake.GetPrerequisites +RunCMake.GNUInstallDirs +RunCMake.Languages +RunCMake.LinkStatic +RunCMake.ParseImplicitIncludeInfo +RunCMake.ParseImplicitLinkInfo +RunCMake.ScriptMode +RunCMake.TargetObjects +RunCMake.TargetProperties +RunCMake.ToolchainFile +RunCMake.find_dependency +RunCMake.CompileDefinitions +RunCMake.PolicyScope +RunCMake.WriteBasicConfigVersionFile +RunCMake.SourceProperties +RunCMake.WorkingDirectory +RunCMake.add_custom_target +RunCMake.add_dependencies +RunCMake.add_executable +RunCMake.build_command +RunCMake.cmake_minimum_required +RunCMake.cmake_parse_arguments +RunCMake.continue +RunCMake.ctest_cmake_error +RunCMake.ctest_configure +RunCMake.ctest_coverage +RunCMake.ctest_start +RunCMake.ctest_disabled_test +RunCMake.ctest_skipped_test +RunCMake.ctest_update +RunCMake.ctest_upload +RunCMake.file-CHMOD +RunCMake.find_file +RunCMake.find_library +RunCMake.find_path +RunCMake.find_program +RunCMake.foreach +RunCMake.function +RunCMake.get_filename_component +RunCMake.get_property +RunCMake.if +RunCMake.include +RunCMake.include_directories +RunCMake.include_guard +RunCMake.load_cache +RunCMake.math +RunCMake.message +RunCMake.option +RunCMake.project_injected +RunCMake.return +RunCMake.separate_arguments +RunCMake.set_property +RunCMake.string +RunCMake.test_include_dirs +RunCMake.BundleUtilities +RunCMake.try_run +RunCMake.set +RunCMake.variable_watch +RunCMake.while +RunCMake.TargetPolicies +RunCMake.no_install_prefix +RunCMake.SymlinkTrees +RunCMake.File_Archive +RunCMake.File_Configure +RunCMake.ExportWithoutLanguage +RunCMake.target_compile_definitions +RunCMake.target_compile_options +RunCMake.target_include_directories +RunCMake.target_sources +RunCMake.CommandLineTar +RunCMake.CPackCommandLine +RunCMake.CacheNewline +RunCMake.CPackSymlinks +RunCMake.CTestCommandExpandLists From f5b116c2a5a6d6d79b0c513c8937d83c5d6d137a Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Thu, 10 Jun 2021 11:49:07 +0000 Subject: [PATCH 067/238] drop unwanted scratch build rule for gating --- gating.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index 9d32f2a..aaa7415 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,7 +5,6 @@ decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation} --- !Policy product_versions: - rhel-8 From 6b692336ecb129810f2264406eb5a021387c15e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 25 Aug 2021 19:54:26 +0200 Subject: [PATCH 068/238] cmake-3.21.2 Fixes rhbz#1997708 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 4858d2c..8806aaa 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.1 +Version: %{major_version}.%{minor_version}.2 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -516,6 +516,10 @@ popd %changelog +* Wed Aug 25 2021 Björn Esser - 3.21.2-1 +- cmake-3.21.2 + Fixes rhbz#1997708 + * Tue Jul 27 2021 Björn Esser - 3.21.1-1 - cmake-3.21.1 Fixes rhbz#1986449 diff --git a/sources b/sources index 337b18b..2723e77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.21.1.tar.gz) = 1453b1f5139950f501c570c305257e4e5dacb8224944de8ed1489aae162c6dd75fe1cd5188d619c47e4e53ca5b846f07318ffb3ab004a0547f2c8b13f60083b4 +SHA512 (cmake-3.21.2.tar.gz) = 75649404564aaa6175a8c66ab19a10318066dbb667806c287e3cb125ac4c16c1629c160e355bcc50864a38d5488b1f7d1bc77acc602f5f3edd5f68691ae5080d From aec38b0832981116891495d2b8863f5b801391b9 Mon Sep 17 00:00:00 2001 From: Marie Loise Nolden Date: Sat, 4 Sep 2021 05:53:44 +0000 Subject: [PATCH 069/238] Update cmake.spec --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 8806aaa..fe2766e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -100,7 +100,7 @@ Source5: %{name}.req # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch # replace release flag -O3 with -O2 for fedora -%if 0%{?fedora} < 34 +%if 0%{?fedora} && 0%{?fedora} < 34 Patch101: %{name}-fedora-flag_release.patch %endif # Add dl to CMAKE_DL_LIBS on MINGW From 090b4a0767eccd94c3b1aba46253a6e1a093267c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 20 Sep 2021 21:57:59 +0200 Subject: [PATCH 070/238] cmake-3.21.3 Fixes rhbz#2006054 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index fe2766e..d954f64 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.2 +Version: %{major_version}.%{minor_version}.3 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -516,6 +516,10 @@ popd %changelog +* Mon Sep 20 2021 Björn Esser - 3.21.3-1 +- cmake-3.21.3 + Fixes rhbz#2006054 + * Wed Aug 25 2021 Björn Esser - 3.21.2-1 - cmake-3.21.2 Fixes rhbz#1997708 diff --git a/sources b/sources index 2723e77..b084ada 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.21.2.tar.gz) = 75649404564aaa6175a8c66ab19a10318066dbb667806c287e3cb125ac4c16c1629c160e355bcc50864a38d5488b1f7d1bc77acc602f5f3edd5f68691ae5080d +SHA512 (cmake-3.21.3.tar.gz) = 0571b78443906c5ad51fb0fafbd32d565caf628cc150b1190802cb819e8497c108ea6b7ecaa03133df2dbbceb730696d24b4df38468c92088c769ce4076d9e9f From 53b926554c5397bab962a63dd7efdbfe0224eb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 14 Oct 2021 17:35:03 +0200 Subject: [PATCH 071/238] cmake-3.22.0-rc1 Fixes rhbz#2014190 --- cmake-fedora-flag_release.patch | 60 ++++++++++++++++----------------- cmake-findruby.patch | 8 ++--- cmake-mingw-dl.patch | 25 ++++++-------- cmake.spec | 12 ++++--- sources | 2 +- 5 files changed, 54 insertions(+), 53 deletions(-) diff --git a/cmake-fedora-flag_release.patch b/cmake-fedora-flag_release.patch index 93be92e..c473d5f 100644 --- a/cmake-fedora-flag_release.patch +++ b/cmake-fedora-flag_release.patch @@ -1,7 +1,7 @@ -Index: cmake-3.17.0-rc1/Modules/Compiler/Absoft-Fortran.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/Absoft-Fortran.cmake =================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Compiler/Absoft-Fortran.cmake -+++ cmake-3.17.0-rc1/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.0-rc1/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.0-rc1/Modules/Compiler/G95-Fortran.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/G95-Fortran.cmake =================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Compiler/G95-Fortran.cmake -+++ cmake-3.17.0-rc1/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.0-rc1/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.0-rc1/Modules/Compiler/GNU.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/GNU.cmake =================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU.cmake -+++ cmake-3.17.0-rc1/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.0-rc1/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.0-rc1/Modules/Compiler/GNU-Fortran.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/GNU-Fortran.cmake =================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Compiler/GNU-Fortran.cmake -+++ cmake-3.17.0-rc1/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.0-rc1/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.0-rc1/Modules/Compiler/Intel.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/Intel.cmake =================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Compiler/Intel.cmake -+++ cmake-3.17.0-rc1/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.0-rc1/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.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake =================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Compiler/NVIDIA-CUDA.cmake -+++ cmake-3.17.0-rc1/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.0-rc1/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.0-rc1/Modules/Compiler/PathScale.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/PathScale.cmake =================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Compiler/PathScale.cmake -+++ cmake-3.17.0-rc1/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.0-rc1/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.0-rc1/Modules/Compiler/PGI.cmake +Index: cmake-3.22.0-rc1/Modules/Compiler/PGI.cmake =================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Compiler/PGI.cmake -+++ cmake-3.17.0-rc1/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,11 +101,11 @@ Index: cmake-3.17.0-rc1/Modules/Compiler/PGI.cmake string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt") if(CMAKE_HOST_WIN32) -Index: cmake-3.17.0-rc1/Modules/Platform/Windows-Clang.cmake +Index: cmake-3.22.0-rc1/Modules/Platform/Windows-Clang.cmake =================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-Clang.cmake -+++ cmake-3.17.0-rc1/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}") diff --git a/cmake-findruby.patch b/cmake-findruby.patch index 50e6a6e..23966a2 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,8 +1,8 @@ -Index: cmake-3.18.0-rc1/Modules/FindRuby.cmake +Index: cmake-3.22.0-rc1/Modules/FindRuby.cmake =================================================================== ---- cmake-3.18.0-rc1.orig/Modules/FindRuby.cmake -+++ cmake-3.18.0-rc1/Modules/FindRuby.cmake -@@ -289,14 +289,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_ +--- 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) diff --git a/cmake-mingw-dl.patch b/cmake-mingw-dl.patch index ef24234..8b0135e 100644 --- a/cmake-mingw-dl.patch +++ b/cmake-mingw-dl.patch @@ -1,21 +1,18 @@ -Index: cmake-3.17.0-rc1/Modules/Platform/Windows-GNU.cmake +Index: cmake-3.22.0-rc1/Modules/Platform/Windows-GNU.cmake =================================================================== ---- cmake-3.17.0-rc1.orig/Modules/Platform/Windows-GNU.cmake -+++ cmake-3.17.0-rc1/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 d954f64..cb4cf5f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -58,9 +58,9 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 21 +%global minor_version 22 # Set to RC version if building RC, else %%{nil} -#global rcsuf rc1 +%global rcsuf rc1 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} @@ -72,8 +72,8 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.3 -Release: %{baserelease}%{?relsuf}%{?dist} +Version: %{major_version}.%{minor_version}.0 +Release: 0.%{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -516,6 +516,10 @@ popd %changelog +* Thu Oct 14 2021 Björn Esser - 3.22.0-0.1.rc1 +- cmake-3.22.0-rc1 + Fixes rhbz#2014190 + * Mon Sep 20 2021 Björn Esser - 3.21.3-1 - cmake-3.21.3 Fixes rhbz#2006054 diff --git a/sources b/sources index b084ada..cdeada1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.21.3.tar.gz) = 0571b78443906c5ad51fb0fafbd32d565caf628cc150b1190802cb819e8497c108ea6b7ecaa03133df2dbbceb730696d24b4df38468c92088c769ce4076d9e9f +SHA512 (cmake-3.22.0-rc1.tar.gz) = ed2a7c0832fd6fef5909745b6d540d1eee4b7f6681dca6e2b5cd22ea1a2be795fc1cb3b25792719211d7fe94871aa12253f4ce088985652496b3fdcbf0000e20 From ff5639876b08ef13fb9890b0f19800d40d7ee681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 14 Oct 2021 17:56:14 +0200 Subject: [PATCH 072/238] Do not build non-lto objects to reduce build time significantly --- cmake.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake.spec b/cmake.spec index cb4cf5f..1f6367c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -48,6 +48,9 @@ # Enable X11 tests %bcond_without X11_test +# Do not build non-lto objects to reduce build time significantly. +%global optflags %(echo '%{optflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g') + # Place rpm-macros into proper location %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) @@ -519,6 +522,7 @@ popd * Thu Oct 14 2021 Björn Esser - 3.22.0-0.1.rc1 - cmake-3.22.0-rc1 Fixes rhbz#2014190 +- Do not build non-lto objects to reduce build time significantly * Mon Sep 20 2021 Björn Esser - 3.21.3-1 - cmake-3.21.3 From 7e4503e30dd9a069bb1e0a37e19f27ed141ffed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 14 Oct 2021 18:12:44 +0200 Subject: [PATCH 073/238] Explicitly force optimization level 2 and debuginfo for release builds --- cmake.spec | 16 ++++++++++++---- macros.cmake | 6 +++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/cmake.spec b/cmake.spec index 1f6367c..d934bf2 100644 --- a/cmake.spec +++ b/cmake.spec @@ -302,8 +302,10 @@ FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS SRCDIR="$(/usr/bin/pwd)" mkdir %{_vpath_builddir} pushd %{_vpath_builddir} -$SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \ - --docdir=/share/doc/%{name} --mandir=/share/man \ +$SRCDIR/bootstrap --prefix=%{_prefix} \ + --datadir=/share/%{name} \ + --docdir=/share/doc/%{name} \ + --mandir=/share/man \ --%{?with_bootstrap:no-}system-libs \ --parallel="$(echo %{?_smp_mflags} | sed -e 's|-j||g')" \ %if %{with bundled_rhash} @@ -318,9 +320,14 @@ $SRCDIR/bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \ --sphinx-build=%{_bindir}/false \ %endif --%{!?with_gui:no-}qt-gui \ -; + -- \ + -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \ + -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \ + -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ + -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF popd -%make_build -C %{_vpath_builddir} VERBOSE=1 +%make_build -C %{_vpath_builddir} %install @@ -523,6 +530,7 @@ popd - cmake-3.22.0-rc1 Fixes rhbz#2014190 - Do not build non-lto objects to reduce build time significantly +- Explicitly force optimization level 2 and debuginfo for release builds * Mon Sep 20 2021 Björn Esser - 3.21.3-1 - cmake-3.21.3 diff --git a/macros.cmake b/macros.cmake index 54598ee..3f24be0 100644 --- a/macros.cmake +++ b/macros.cmake @@ -29,9 +29,9 @@ %__cmake \\\ %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\ %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\ - -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ - -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \\\ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \\\ + -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ From ff8467c934208cca6ec254311ce981dc58dce0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 28 Oct 2021 10:31:51 +0200 Subject: [PATCH 074/238] Revert previous changes to marcos.cmake (-O2 -g) Fixes rhbz#2017942 --- cmake.spec | 6 +++++- macros.cmake | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index d934bf2..23b27fb 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,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} @@ -526,6 +526,10 @@ popd %changelog +* Thu Oct 28 2021 Björn Esser - 3.22.0-0.2.rc1 +- Revert previous changes to marcos.cmake (-O2 -g) + Fixes rhbz#2017942 + * Thu Oct 14 2021 Björn Esser - 3.22.0-0.1.rc1 - cmake-3.22.0-rc1 Fixes rhbz#2014190 diff --git a/macros.cmake b/macros.cmake index 3f24be0..7cfe7ec 100644 --- a/macros.cmake +++ b/macros.cmake @@ -29,9 +29,9 @@ %__cmake \\\ %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\ %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\ - -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \\\ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \\\ - -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \\\ + -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ + -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-g -DNDEBUG" \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ From 8ad8eb9214db047d16b36c83d0c7b658bf67500a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 28 Oct 2021 10:34:56 +0200 Subject: [PATCH 075/238] Fix typo --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 23b27fb..b29cade 100644 --- a/cmake.spec +++ b/cmake.spec @@ -527,7 +527,7 @@ popd %changelog * Thu Oct 28 2021 Björn Esser - 3.22.0-0.2.rc1 -- Revert previous changes to marcos.cmake (-O2 -g) +- Revert previous changes to macros.cmake (-O2 -g) Fixes rhbz#2017942 * Thu Oct 14 2021 Björn Esser - 3.22.0-0.1.rc1 From 47534abef0a010aee1d1ad763fde46730801cc2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 28 Oct 2021 18:30:41 +0200 Subject: [PATCH 076/238] cmake-3.22.0-rc2 Fixes rhbz#2018235 --- cmake.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index b29cade..3313ff2 100644 --- a/cmake.spec +++ b/cmake.spec @@ -63,12 +63,12 @@ %global major_version 3 %global minor_version 22 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc1 +%global rcsuf rc2 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -526,6 +526,10 @@ popd %changelog +* Thu Oct 28 2021 Björn Esser - 3.22.0-0.3.rc2 +- cmake-3.22.0-rc2 + Fixes rhbz#2018235 + * Thu Oct 28 2021 Björn Esser - 3.22.0-0.2.rc1 - Revert previous changes to macros.cmake (-O2 -g) Fixes rhbz#2017942 diff --git a/sources b/sources index cdeada1..7f97f10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.22.0-rc1.tar.gz) = ed2a7c0832fd6fef5909745b6d540d1eee4b7f6681dca6e2b5cd22ea1a2be795fc1cb3b25792719211d7fe94871aa12253f4ce088985652496b3fdcbf0000e20 +SHA512 (cmake-3.22.0-rc2.tar.gz) = ccb1e45ef25100f933a2238f73c0dbb65cdd602c6a8de36cce34696f9e5c54e061b67857c2d83ea8da6583394d2c51afbe6820dfd49ff3a4a19e6f4a40796fde From 6bbf683451a0a4a1e00e24471c72a665a13f055c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 28 Oct 2021 18:35:35 +0200 Subject: [PATCH 077/238] Remove debug compiler flag in macros.cmake (CMAKE_Fortran_FLAGS_RELEASE) Fixes rhbz#2017942 Complements: ff8467c934208cca6ec254311ce981dc58dce0d9 --- cmake.spec | 2 ++ macros.cmake | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 3313ff2..0629996 100644 --- a/cmake.spec +++ b/cmake.spec @@ -529,6 +529,8 @@ popd * Thu Oct 28 2021 Björn Esser - 3.22.0-0.3.rc2 - cmake-3.22.0-rc2 Fixes rhbz#2018235 +- Remove debug compiler flag in macros.cmake (CMAKE_Fortran_FLAGS_RELEASE) + Fixes rhbz#2017942 * Thu Oct 28 2021 Björn Esser - 3.22.0-0.2.rc1 - Revert previous changes to macros.cmake (-O2 -g) diff --git a/macros.cmake b/macros.cmake index 7cfe7ec..54598ee 100644 --- a/macros.cmake +++ b/macros.cmake @@ -31,7 +31,7 @@ %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ - -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-g -DNDEBUG" \\\ + -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ From ad120f2a4c5f1c5b34d4e9b9201eafa9a0f0fde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 3 Nov 2021 20:03:38 +0100 Subject: [PATCH 078/238] Rebuild (jsoncpp) --- cmake.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 0629996..7b2be03 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture -%bcond_with bootstrap +%bcond_without bootstrap # Build with Emacs support %bcond_without emacs @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -526,6 +526,9 @@ popd %changelog +* Wed Nov 03 2021 Björn Esser - 3.22.0-0.4.rc2 +- Rebuild (jsoncpp) + * Thu Oct 28 2021 Björn Esser - 3.22.0-0.3.rc2 - cmake-3.22.0-rc2 Fixes rhbz#2018235 From 887221a3da98b648b37a982328f13feadad78a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 3 Nov 2021 20:17:42 +0100 Subject: [PATCH 079/238] Disable bootstrap build --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 7b2be03..923dd8d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture -%bcond_without bootstrap +%bcond_with bootstrap # Build with Emacs support %bcond_without emacs From 43d177fa45eec822c879afbe3d3c0a6d87d7653a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 3 Nov 2021 21:00:39 +0100 Subject: [PATCH 080/238] Enable bootstrap, without gui, and without tests --- cmake.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 923dd8d..2288f52 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture -%bcond_with bootstrap +%bcond_without bootstrap # Build with Emacs support %bcond_without emacs @@ -17,7 +17,7 @@ %bcond_without git_test # Set to bcond_with or use --without gui to disable qt4 gui build -%bcond_without gui +%bcond_with gui # Use ncurses for colorful output %bcond_without ncurses @@ -43,7 +43,7 @@ %endif # Run tests -%bcond_without test +%bcond_with test # Enable X11 tests %bcond_without X11_test From c10f3133b9b7195b62b5fb76241079cde3d7a7e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 3 Nov 2021 21:03:15 +0100 Subject: [PATCH 081/238] Revert "Enable bootstrap, without gui, and without tests" This reverts commit 43d177fa45eec822c879afbe3d3c0a6d87d7653a. --- cmake.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 2288f52..923dd8d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture -%bcond_without bootstrap +%bcond_with bootstrap # Build with Emacs support %bcond_without emacs @@ -17,7 +17,7 @@ %bcond_without git_test # Set to bcond_with or use --without gui to disable qt4 gui build -%bcond_with gui +%bcond_without gui # Use ncurses for colorful output %bcond_without ncurses @@ -43,7 +43,7 @@ %endif # Run tests -%bcond_with test +%bcond_without test # Enable X11 tests %bcond_without X11_test From e2ea5cd999016e02868497e8f292c8c241f64ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 3 Nov 2021 21:24:29 +0100 Subject: [PATCH 082/238] Build without gui, and without tests This partially reverts commit c10f3133b9b7195b62b5fb76241079cde3d7a7e0. --- cmake.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 923dd8d..1cbede6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -17,7 +17,7 @@ %bcond_without git_test # Set to bcond_with or use --without gui to disable qt4 gui build -%bcond_without gui +%bcond_with gui # Use ncurses for colorful output %bcond_without ncurses @@ -43,7 +43,7 @@ %endif # Run tests -%bcond_without test +%bcond_with test # Enable X11 tests %bcond_without X11_test From 2c104d87da068174df5ab7ca46b60bc8353aee1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 3 Nov 2021 21:26:38 +0100 Subject: [PATCH 083/238] Revert "Build without gui, and without tests" This reverts commit e2ea5cd999016e02868497e8f292c8c241f64ac1. --- cmake.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 1cbede6..923dd8d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -17,7 +17,7 @@ %bcond_without git_test # Set to bcond_with or use --without gui to disable qt4 gui build -%bcond_with gui +%bcond_without gui # Use ncurses for colorful output %bcond_without ncurses @@ -43,7 +43,7 @@ %endif # Run tests -%bcond_with test +%bcond_without test # Enable X11 tests %bcond_without X11_test From 38dd024421aeb3be4fba8a89e844100424fed213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 3 Nov 2021 21:47:04 +0100 Subject: [PATCH 084/238] Disable bootstrap build for jsoncpp --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 923dd8d..9958df4 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 4 +%global baserelease 5 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -526,6 +526,9 @@ popd %changelog +* Wed Nov 03 2021 Björn Esser - 3.22.0-0.5.rc2 +- Disable bootstrap build for jsoncpp + * Wed Nov 03 2021 Björn Esser - 3.22.0-0.4.rc2 - Rebuild (jsoncpp) From 3909660989a3e923d0567e382a92cde6b2774b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 12 Nov 2021 21:05:56 +0100 Subject: [PATCH 085/238] cmake-3.22.0-rc3 Fixes rhbz#2022785 --- cmake.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 9958df4..9b45e40 100644 --- a/cmake.spec +++ b/cmake.spec @@ -63,12 +63,12 @@ %global major_version 3 %global minor_version 22 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc2 +%global rcsuf rc3 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 5 +%global baserelease 6 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -526,6 +526,10 @@ popd %changelog +* Fri Nov 12 2021 Björn Esser - 3.22.0-0.6.rc3 +- cmake-3.22.0-rc3 + Fixes rhbz#2022785 + * Wed Nov 03 2021 Björn Esser - 3.22.0-0.5.rc2 - Disable bootstrap build for jsoncpp diff --git a/sources b/sources index 7f97f10..77cce08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.22.0-rc2.tar.gz) = ccb1e45ef25100f933a2238f73c0dbb65cdd602c6a8de36cce34696f9e5c54e061b67857c2d83ea8da6583394d2c51afbe6820dfd49ff3a4a19e6f4a40796fde +SHA512 (cmake-3.22.0-rc3.tar.gz) = 77635c2873f248a40cf570dd96eccfd786016c121e741019cf436d9ec9a824a4948ce3135affa0ce18878eddbdc9366869998179870b29db9e8410c2ff9b6ded From 12df3dd3f70ca0748d9afd5f4606333135a37b9f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 18 Nov 2021 14:41:58 -0600 Subject: [PATCH 086/238] cmake-3.22.0 (#2024712) --- cmake.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index 9b45e40..6f58a55 100644 --- a/cmake.spec +++ b/cmake.spec @@ -63,12 +63,12 @@ %global major_version 3 %global minor_version 22 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc3 +#global rcsuf %%{nil} %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 6 +%global baserelease 1 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -76,7 +76,7 @@ Name: %{orig_name}%{?name_suffix} Version: %{major_version}.%{minor_version}.0 -Release: 0.%{baserelease}%{?relsuf}%{?dist} +Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -526,6 +526,9 @@ popd %changelog +* Thu Nov 18 2021 Rex Dieter - 3.22.0-1 +- cmake-3.22.0 (#2024712) + * Fri Nov 12 2021 Björn Esser - 3.22.0-0.6.rc3 - cmake-3.22.0-rc3 Fixes rhbz#2022785 diff --git a/sources b/sources index 77cce08..2078af1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.22.0-rc3.tar.gz) = 77635c2873f248a40cf570dd96eccfd786016c121e741019cf436d9ec9a824a4948ce3135affa0ce18878eddbdc9366869998179870b29db9e8410c2ff9b6ded +SHA512 (cmake-3.22.0.tar.gz) = 72e4e39bfd0a918572228af68391422979f89a0a5020fae7764b5d7ba86a7a56e8174e22f1b0ffeb37b741c0a6118162a2a47655a03939ea0535453186ed385c From c8720654f43fc1c4e8b814393bd04c9cd5fd3d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 28 Nov 2021 21:07:28 +0100 Subject: [PATCH 087/238] Add patch to partially revert incompatible changes in GNUInstallDirs.cmake Fixes rhbz#2027118 --- cmake-3.22.0-rhbz2027118.patch | 29 +++++++++++++++++++++++++++++ cmake.spec | 8 +++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 cmake-3.22.0-rhbz2027118.patch diff --git a/cmake-3.22.0-rhbz2027118.patch b/cmake-3.22.0-rhbz2027118.patch new file mode 100644 index 0000000..370073a --- /dev/null +++ b/cmake-3.22.0-rhbz2027118.patch @@ -0,0 +1,29 @@ +From 2066bbfedc068a5adc21338d100216471e4aadc5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Sun, 28 Nov 2021 21:03:37 +0100 +Subject: [PATCH] Fix rhbz#2027118. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Björn Esser +--- + Modules/GNUInstallDirs.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake +index 489c233197..b02d090436 100644 +--- a/Modules/GNUInstallDirs.cmake ++++ b/Modules/GNUInstallDirs.cmake +@@ -281,7 +281,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set + set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") + endif() + endif() +- elseif(NOT DEFINED __system_type_for_install) ++ else() + # not debian, alpine, arch, or conda so rely on CMAKE_SIZEOF_VOID_P: + if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + set(_LIBDIR_DEFAULT "lib64") +-- +2.33.1 + diff --git a/cmake.spec b/cmake.spec index 6f58a55..cb88188 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,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} @@ -109,6 +109,8 @@ Patch101: %{name}-fedora-flag_release.patch # Add dl to CMAKE_DL_LIBS on MINGW # https://gitlab.kitware.com/cmake/cmake/issues/17600 Patch102: %{name}-mingw-dl.patch +# rhbz#2027118 +Patch103: %{name}-3.22.0-rhbz2027118.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -526,6 +528,10 @@ popd %changelog +* Sun Nov 28 2021 Björn Esser - 3.22.0-2 +- Add patch to partially revert incompatible changes in GNUInstallDirs.cmake + Fixes rhbz#2027118 + * Thu Nov 18 2021 Rex Dieter - 3.22.0-1 - cmake-3.22.0 (#2024712) From 4da2a4b8c19013bc13ea41ca664e5b9ecaf81b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 1 Dec 2021 18:41:40 +0100 Subject: [PATCH 088/238] Update fix for rhbz#2027118 with upstream solution --- cmake-3.22.0-rhbz2027118.patch | 45 +++++++++++++++++++--------------- cmake.spec | 8 ++++-- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/cmake-3.22.0-rhbz2027118.patch b/cmake-3.22.0-rhbz2027118.patch index 370073a..5222d1a 100644 --- a/cmake-3.22.0-rhbz2027118.patch +++ b/cmake-3.22.0-rhbz2027118.patch @@ -1,29 +1,34 @@ -From 2066bbfedc068a5adc21338d100216471e4aadc5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Sun, 28 Nov 2021 21:03:37 +0100 -Subject: [PATCH] Fix rhbz#2027118. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From 7896991af029d66c9e1692ce18027fafaa0e9bd8 Mon Sep 17 00:00:00 2001 +From: Robert Maynard +Date: Mon, 29 Nov 2021 13:47:16 -0500 +Subject: [PATCH] GNUInstallDirs: Prefer system lib64 over conda lib when + ambiguous -Signed-off-by: Björn Esser +Update logic added by commit ecaca8c129 (GNUInstallDirs now aware of +conda lib directory requirements, 2021-09-08, v3.22.0-rc1~142^2). +When it is ambiguous if we are doing a conda install or a system +install prefer using the system library directory. + +Fixes: #22962 --- - Modules/GNUInstallDirs.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + Modules/GNUInstallDirs.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake -index 489c233197..b02d090436 100644 +index 6ca424ad5d..01bd63716c 100644 --- a/Modules/GNUInstallDirs.cmake +++ b/Modules/GNUInstallDirs.cmake -@@ -281,7 +281,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set - set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") - endif() +@@ -253,7 +253,9 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set + elseif(DEFINED ENV{CONDA_PREFIX}) + set(conda_prefix "$ENV{CONDA_PREFIX}") + cmake_path(ABSOLUTE_PATH conda_prefix NORMALIZE) +- if("${CMAKE_INSTALL_PREFIX}" STREQUAL conda_prefix) ++ if("${CMAKE_INSTALL_PREFIX}" STREQUAL conda_prefix AND ++ NOT ("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$" OR ++ "${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$")) + set(__system_type_for_install "conda") endif() -- elseif(NOT DEFINED __system_type_for_install) -+ else() - # not debian, alpine, arch, or conda so rely on CMAKE_SIZEOF_VOID_P: - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - set(_LIBDIR_DEFAULT "lib64") + endif() -- -2.33.1 +GitLab diff --git a/cmake.spec b/cmake.spec index cb88188..03ff635 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -110,7 +110,8 @@ Patch101: %{name}-fedora-flag_release.patch # https://gitlab.kitware.com/cmake/cmake/issues/17600 Patch102: %{name}-mingw-dl.patch # rhbz#2027118 -Patch103: %{name}-3.22.0-rhbz2027118.patch +# https://gitlab.kitware.com/cmake/cmake/-/issues/22962 +Patch103: https://gitlab.kitware.com/cmake/cmake/-/commit/7896991af029d66c9e1692ce18027fafaa0e9bd8.patch#/%{name}-3.22.0-rhbz2027118.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -528,6 +529,9 @@ popd %changelog +* Wed Dec 01 2021 Björn Esser - 3.22.0-3 +- Update fix for rhbz#2027118 with upstream solution + * Sun Nov 28 2021 Björn Esser - 3.22.0-2 - Add patch to partially revert incompatible changes in GNUInstallDirs.cmake Fixes rhbz#2027118 From baa8129dbb8cd487360015fa64c858a3cfecf3d0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 2 Dec 2021 20:57:20 +0100 Subject: [PATCH 089/238] Fixes RPATH_CHANGE fails when shared object is a GNU ld script --- ...h-unrecognized-format-into-release-3.patch | 222 ++++++++++++++++++ cmake.spec | 7 +- 2 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 0001-Merge-topic-rpath-unrecognized-format-into-release-3.patch diff --git a/0001-Merge-topic-rpath-unrecognized-format-into-release-3.patch b/0001-Merge-topic-rpath-unrecognized-format-into-release-3.patch new file mode 100644 index 0000000..303a52b --- /dev/null +++ b/0001-Merge-topic-rpath-unrecognized-format-into-release-3.patch @@ -0,0 +1,222 @@ +From 3883b11edbb983c72f0d1f2f13ad29fd8a630514 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Thu, 2 Dec 2021 16:45:16 +0000 +Subject: [PATCH] Merge topic 'rpath-unrecognized-format' into release-3.22 + +643fc46bdc file(RPATH): Restore tolerance of unknown formats if new RPATH is empty +5596cba7dc cmSystemTools: Remove unnecessary mark-as-used casts to void + +Acked-by: Kitware Robot +Acked-by: buildbot +Merge-request: !6779 +--- + Source/cmSystemTools.cxx | 25 +++++++++++++++++++++---- + Tests/RunCMake/file-RPATH/RunCMakeTest.cmake | 11 +++++++++++ + Tests/RunCMake/file-RPATH/TextChange-result.txt | 1 + + Tests/RunCMake/file-RPATH/TextChange-stderr.txt | 12 ++++++++++++ + Tests/RunCMake/file-RPATH/TextChange.cmake | 3 +++ + Tests/RunCMake/file-RPATH/TextChangeEmpty.cmake | 3 +++ + Tests/RunCMake/file-RPATH/TextCheck.cmake | 6 ++++++ + Tests/RunCMake/file-RPATH/TextCheckEmpty.cmake | 6 ++++++ + Tests/RunCMake/file-RPATH/TextRemove.cmake | 3 +++ + Tests/RunCMake/file-RPATH/TextSet-result.txt | 1 + + Tests/RunCMake/file-RPATH/TextSet-stderr.txt | 12 ++++++++++++ + Tests/RunCMake/file-RPATH/TextSet.cmake | 3 +++ + Tests/RunCMake/file-RPATH/TextSetEmpty.cmake | 3 +++ + 13 files changed, 85 insertions(+), 4 deletions(-) + +diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx +index 75a5a8d878..1934393bb0 100644 +--- a/Source/cmSystemTools.cxx ++++ b/Source/cmSystemTools.cxx +@@ -2869,6 +2869,14 @@ bool cmSystemTools::ChangeRPath(std::string const& file, + file, oldRPath, newRPath, removeEnvironmentRPath, emsg, changed)) { + return result.value(); + } ++ // The file format is not recognized. Assume it has no RPATH. ++ if (newRPath.empty()) { ++ // The caller wanted no RPATH anyway. ++ return true; ++ } ++ if (emsg) { ++ *emsg = "The file format is not recognized."; ++ } + return false; + } + +@@ -2883,6 +2891,14 @@ bool cmSystemTools::SetRPath(std::string const& file, + SetRPathXCOFF(file, newRPath, emsg, changed)) { + return result.value(); + } ++ // The file format is not recognized. Assume it has no RPATH. ++ if (newRPath.empty()) { ++ // The caller wanted no RPATH anyway. ++ return true; ++ } ++ if (emsg) { ++ *emsg = "The file format is not recognized."; ++ } + return false; + } + +@@ -3212,7 +3228,8 @@ bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg, + if (cm::optional result = RemoveRPathXCOFF(file, emsg, removed)) { + return result.value(); + } +- return false; ++ // The file format is not recognized. Assume it has no RPATH. ++ return true; + } + + bool cmSystemTools::CheckRPath(std::string const& file, +@@ -3252,9 +3269,9 @@ bool cmSystemTools::CheckRPath(std::string const& file, + return false; + } + #endif +- (void)file; +- (void)newRPath; +- return false; ++ // The file format is not recognized. Assume it has no RPATH. ++ // Therefore we succeed if the new rpath is empty anyway. ++ return newRPath.empty(); + } + + bool cmSystemTools::RepeatedRemoveDirectory(const std::string& dir) +diff --git a/Tests/RunCMake/file-RPATH/RunCMakeTest.cmake b/Tests/RunCMake/file-RPATH/RunCMakeTest.cmake +index 1ca2e757a6..525df09c3e 100644 +--- a/Tests/RunCMake/file-RPATH/RunCMakeTest.cmake ++++ b/Tests/RunCMake/file-RPATH/RunCMakeTest.cmake +@@ -5,3 +5,14 @@ run_cmake_command(ELF ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/ELF.cmake) + if(CMAKE_SYSTEM_NAME STREQUAL "AIX") + run_cmake_command(XCOFF ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/XCOFF.cmake) + endif() ++ ++run_cmake_command(TextCheck ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextCheck.cmake) ++run_cmake_command(TextCheckEmpty ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextCheckEmpty.cmake) ++ ++run_cmake_command(TextChange ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextChange.cmake) ++run_cmake_command(TextChangeEmpty ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextChangeEmpty.cmake) ++ ++run_cmake_command(TextSet ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextSet.cmake) ++run_cmake_command(TextSetEmpty ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextSetEmpty.cmake) ++ ++run_cmake_command(TextRemove ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextRemove.cmake) +diff --git a/Tests/RunCMake/file-RPATH/TextChange-result.txt b/Tests/RunCMake/file-RPATH/TextChange-result.txt +new file mode 100644 +index 0000000000..d00491fd7e +--- /dev/null ++++ b/Tests/RunCMake/file-RPATH/TextChange-result.txt +@@ -0,0 +1 @@ ++1 +diff --git a/Tests/RunCMake/file-RPATH/TextChange-stderr.txt b/Tests/RunCMake/file-RPATH/TextChange-stderr.txt +new file mode 100644 +index 0000000000..48a1bf599f +--- /dev/null ++++ b/Tests/RunCMake/file-RPATH/TextChange-stderr.txt +@@ -0,0 +1,12 @@ ++^CMake Error at [^ ++]*/Tests/RunCMake/file-RPATH/TextChange.cmake:[0-9]+ \(file\): ++ file RPATH_CHANGE could not write new RPATH: ++ ++ /new/rpath ++ ++ to the file: ++ ++ [^ ++]*/Tests/RunCMake/file-RPATH/TextChange-build/not_a_binary.txt ++ ++ The file format is not recognized\.$ +diff --git a/Tests/RunCMake/file-RPATH/TextChange.cmake b/Tests/RunCMake/file-RPATH/TextChange.cmake +new file mode 100644 +index 0000000000..5c599eca27 +--- /dev/null ++++ b/Tests/RunCMake/file-RPATH/TextChange.cmake +@@ -0,0 +1,3 @@ ++set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") ++file(WRITE "${f}" "Not a binary.\n") ++file(RPATH_CHANGE FILE "${f}" OLD_RPATH "/old/rpath" NEW_RPATH "/new/rpath") +diff --git a/Tests/RunCMake/file-RPATH/TextChangeEmpty.cmake b/Tests/RunCMake/file-RPATH/TextChangeEmpty.cmake +new file mode 100644 +index 0000000000..8f855d9477 +--- /dev/null ++++ b/Tests/RunCMake/file-RPATH/TextChangeEmpty.cmake +@@ -0,0 +1,3 @@ ++set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") ++file(WRITE "${f}" "Not a binary.\n") ++file(RPATH_CHANGE FILE "${f}" OLD_RPATH "/old/rpath" NEW_RPATH "") +diff --git a/Tests/RunCMake/file-RPATH/TextCheck.cmake b/Tests/RunCMake/file-RPATH/TextCheck.cmake +new file mode 100644 +index 0000000000..1f21ba73cd +--- /dev/null ++++ b/Tests/RunCMake/file-RPATH/TextCheck.cmake +@@ -0,0 +1,6 @@ ++set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") ++file(WRITE "${f}" "Not a binary.\n") ++file(RPATH_CHECK FILE "${f}" RPATH "/some/rpath") ++if(EXISTS "${f}") ++ message(FATAL_ERROR "RPATH_CHECK did not remove\n ${f}\nfor non-empty RPATH") ++endif() +diff --git a/Tests/RunCMake/file-RPATH/TextCheckEmpty.cmake b/Tests/RunCMake/file-RPATH/TextCheckEmpty.cmake +new file mode 100644 +index 0000000000..806c73dae7 +--- /dev/null ++++ b/Tests/RunCMake/file-RPATH/TextCheckEmpty.cmake +@@ -0,0 +1,6 @@ ++set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") ++file(WRITE "${f}" "Not a binary.\n") ++file(RPATH_CHECK FILE "${f}" RPATH "") ++if(NOT EXISTS "${f}") ++ message(FATAL_ERROR "RPATH_CHECK removed\n ${f}\nfor empty RPATH") ++endif() +diff --git a/Tests/RunCMake/file-RPATH/TextRemove.cmake b/Tests/RunCMake/file-RPATH/TextRemove.cmake +new file mode 100644 +index 0000000000..aecaf6f436 +--- /dev/null ++++ b/Tests/RunCMake/file-RPATH/TextRemove.cmake +@@ -0,0 +1,3 @@ ++set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") ++file(WRITE "${f}" "Not a binary.\n") ++file(RPATH_REMOVE FILE "${f}") +diff --git a/Tests/RunCMake/file-RPATH/TextSet-result.txt b/Tests/RunCMake/file-RPATH/TextSet-result.txt +new file mode 100644 +index 0000000000..d00491fd7e +--- /dev/null ++++ b/Tests/RunCMake/file-RPATH/TextSet-result.txt +@@ -0,0 +1 @@ ++1 +diff --git a/Tests/RunCMake/file-RPATH/TextSet-stderr.txt b/Tests/RunCMake/file-RPATH/TextSet-stderr.txt +new file mode 100644 +index 0000000000..811c9a5bfc +--- /dev/null ++++ b/Tests/RunCMake/file-RPATH/TextSet-stderr.txt +@@ -0,0 +1,12 @@ ++^CMake Error at [^ ++]*/Tests/RunCMake/file-RPATH/TextSet.cmake:[0-9]+ \(file\): ++ file RPATH_SET could not write new RPATH: ++ ++ /new/rpath ++ ++ to the file: ++ ++ [^ ++]*/Tests/RunCMake/file-RPATH/TextSet-build/not_a_binary.txt ++ ++ The file format is not recognized\.$ +diff --git a/Tests/RunCMake/file-RPATH/TextSet.cmake b/Tests/RunCMake/file-RPATH/TextSet.cmake +new file mode 100644 +index 0000000000..f4b09d248c +--- /dev/null ++++ b/Tests/RunCMake/file-RPATH/TextSet.cmake +@@ -0,0 +1,3 @@ ++set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") ++file(WRITE "${f}" "Not a binary.\n") ++file(RPATH_SET FILE "${f}" NEW_RPATH "/new/rpath") +diff --git a/Tests/RunCMake/file-RPATH/TextSetEmpty.cmake b/Tests/RunCMake/file-RPATH/TextSetEmpty.cmake +new file mode 100644 +index 0000000000..d9517e08c6 +--- /dev/null ++++ b/Tests/RunCMake/file-RPATH/TextSetEmpty.cmake +@@ -0,0 +1,3 @@ ++set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") ++file(WRITE "${f}" "Not a binary.\n") ++file(RPATH_SET FILE "${f}" NEW_RPATH "") diff --git a/cmake.spec b/cmake.spec index 03ff635..1dd7172 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -112,6 +112,8 @@ Patch102: %{name}-mingw-dl.patch # rhbz#2027118 # https://gitlab.kitware.com/cmake/cmake/-/issues/22962 Patch103: https://gitlab.kitware.com/cmake/cmake/-/commit/7896991af029d66c9e1692ce18027fafaa0e9bd8.patch#/%{name}-3.22.0-rhbz2027118.patch +# https://gitlab.kitware.com/cmake/cmake/-/issues/22963 +Patch104: 0001-Merge-topic-rpath-unrecognized-format-into-release-3.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -529,6 +531,9 @@ popd %changelog +* Thu Dec 02 2021 Stephan Bergmann - 3.22.0-4 +- Fixes RPATH_CHANGE fails when shared object is a GNU ld script + * Wed Dec 01 2021 Björn Esser - 3.22.0-3 - Update fix for rhbz#2027118 with upstream solution From 7e2cfc8785f3654a7185876151444f86d0197d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 7 Dec 2021 19:26:22 +0100 Subject: [PATCH 090/238] cmake-3.22.1 Fixes rhbz#2029974 --- ...h-unrecognized-format-into-release-3.patch | 222 ------------------ cmake-3.22.0-rhbz2027118.patch | 34 --- cmake.spec | 13 +- sources | 2 +- 4 files changed, 7 insertions(+), 264 deletions(-) delete mode 100644 0001-Merge-topic-rpath-unrecognized-format-into-release-3.patch delete mode 100644 cmake-3.22.0-rhbz2027118.patch diff --git a/0001-Merge-topic-rpath-unrecognized-format-into-release-3.patch b/0001-Merge-topic-rpath-unrecognized-format-into-release-3.patch deleted file mode 100644 index 303a52b..0000000 --- a/0001-Merge-topic-rpath-unrecognized-format-into-release-3.patch +++ /dev/null @@ -1,222 +0,0 @@ -From 3883b11edbb983c72f0d1f2f13ad29fd8a630514 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Thu, 2 Dec 2021 16:45:16 +0000 -Subject: [PATCH] Merge topic 'rpath-unrecognized-format' into release-3.22 - -643fc46bdc file(RPATH): Restore tolerance of unknown formats if new RPATH is empty -5596cba7dc cmSystemTools: Remove unnecessary mark-as-used casts to void - -Acked-by: Kitware Robot -Acked-by: buildbot -Merge-request: !6779 ---- - Source/cmSystemTools.cxx | 25 +++++++++++++++++++++---- - Tests/RunCMake/file-RPATH/RunCMakeTest.cmake | 11 +++++++++++ - Tests/RunCMake/file-RPATH/TextChange-result.txt | 1 + - Tests/RunCMake/file-RPATH/TextChange-stderr.txt | 12 ++++++++++++ - Tests/RunCMake/file-RPATH/TextChange.cmake | 3 +++ - Tests/RunCMake/file-RPATH/TextChangeEmpty.cmake | 3 +++ - Tests/RunCMake/file-RPATH/TextCheck.cmake | 6 ++++++ - Tests/RunCMake/file-RPATH/TextCheckEmpty.cmake | 6 ++++++ - Tests/RunCMake/file-RPATH/TextRemove.cmake | 3 +++ - Tests/RunCMake/file-RPATH/TextSet-result.txt | 1 + - Tests/RunCMake/file-RPATH/TextSet-stderr.txt | 12 ++++++++++++ - Tests/RunCMake/file-RPATH/TextSet.cmake | 3 +++ - Tests/RunCMake/file-RPATH/TextSetEmpty.cmake | 3 +++ - 13 files changed, 85 insertions(+), 4 deletions(-) - -diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx -index 75a5a8d878..1934393bb0 100644 ---- a/Source/cmSystemTools.cxx -+++ b/Source/cmSystemTools.cxx -@@ -2869,6 +2869,14 @@ bool cmSystemTools::ChangeRPath(std::string const& file, - file, oldRPath, newRPath, removeEnvironmentRPath, emsg, changed)) { - return result.value(); - } -+ // The file format is not recognized. Assume it has no RPATH. -+ if (newRPath.empty()) { -+ // The caller wanted no RPATH anyway. -+ return true; -+ } -+ if (emsg) { -+ *emsg = "The file format is not recognized."; -+ } - return false; - } - -@@ -2883,6 +2891,14 @@ bool cmSystemTools::SetRPath(std::string const& file, - SetRPathXCOFF(file, newRPath, emsg, changed)) { - return result.value(); - } -+ // The file format is not recognized. Assume it has no RPATH. -+ if (newRPath.empty()) { -+ // The caller wanted no RPATH anyway. -+ return true; -+ } -+ if (emsg) { -+ *emsg = "The file format is not recognized."; -+ } - return false; - } - -@@ -3212,7 +3228,8 @@ bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg, - if (cm::optional result = RemoveRPathXCOFF(file, emsg, removed)) { - return result.value(); - } -- return false; -+ // The file format is not recognized. Assume it has no RPATH. -+ return true; - } - - bool cmSystemTools::CheckRPath(std::string const& file, -@@ -3252,9 +3269,9 @@ bool cmSystemTools::CheckRPath(std::string const& file, - return false; - } - #endif -- (void)file; -- (void)newRPath; -- return false; -+ // The file format is not recognized. Assume it has no RPATH. -+ // Therefore we succeed if the new rpath is empty anyway. -+ return newRPath.empty(); - } - - bool cmSystemTools::RepeatedRemoveDirectory(const std::string& dir) -diff --git a/Tests/RunCMake/file-RPATH/RunCMakeTest.cmake b/Tests/RunCMake/file-RPATH/RunCMakeTest.cmake -index 1ca2e757a6..525df09c3e 100644 ---- a/Tests/RunCMake/file-RPATH/RunCMakeTest.cmake -+++ b/Tests/RunCMake/file-RPATH/RunCMakeTest.cmake -@@ -5,3 +5,14 @@ run_cmake_command(ELF ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/ELF.cmake) - if(CMAKE_SYSTEM_NAME STREQUAL "AIX") - run_cmake_command(XCOFF ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/XCOFF.cmake) - endif() -+ -+run_cmake_command(TextCheck ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextCheck.cmake) -+run_cmake_command(TextCheckEmpty ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextCheckEmpty.cmake) -+ -+run_cmake_command(TextChange ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextChange.cmake) -+run_cmake_command(TextChangeEmpty ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextChangeEmpty.cmake) -+ -+run_cmake_command(TextSet ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextSet.cmake) -+run_cmake_command(TextSetEmpty ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextSetEmpty.cmake) -+ -+run_cmake_command(TextRemove ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR}/TextRemove.cmake) -diff --git a/Tests/RunCMake/file-RPATH/TextChange-result.txt b/Tests/RunCMake/file-RPATH/TextChange-result.txt -new file mode 100644 -index 0000000000..d00491fd7e ---- /dev/null -+++ b/Tests/RunCMake/file-RPATH/TextChange-result.txt -@@ -0,0 +1 @@ -+1 -diff --git a/Tests/RunCMake/file-RPATH/TextChange-stderr.txt b/Tests/RunCMake/file-RPATH/TextChange-stderr.txt -new file mode 100644 -index 0000000000..48a1bf599f ---- /dev/null -+++ b/Tests/RunCMake/file-RPATH/TextChange-stderr.txt -@@ -0,0 +1,12 @@ -+^CMake Error at [^ -+]*/Tests/RunCMake/file-RPATH/TextChange.cmake:[0-9]+ \(file\): -+ file RPATH_CHANGE could not write new RPATH: -+ -+ /new/rpath -+ -+ to the file: -+ -+ [^ -+]*/Tests/RunCMake/file-RPATH/TextChange-build/not_a_binary.txt -+ -+ The file format is not recognized\.$ -diff --git a/Tests/RunCMake/file-RPATH/TextChange.cmake b/Tests/RunCMake/file-RPATH/TextChange.cmake -new file mode 100644 -index 0000000000..5c599eca27 ---- /dev/null -+++ b/Tests/RunCMake/file-RPATH/TextChange.cmake -@@ -0,0 +1,3 @@ -+set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") -+file(WRITE "${f}" "Not a binary.\n") -+file(RPATH_CHANGE FILE "${f}" OLD_RPATH "/old/rpath" NEW_RPATH "/new/rpath") -diff --git a/Tests/RunCMake/file-RPATH/TextChangeEmpty.cmake b/Tests/RunCMake/file-RPATH/TextChangeEmpty.cmake -new file mode 100644 -index 0000000000..8f855d9477 ---- /dev/null -+++ b/Tests/RunCMake/file-RPATH/TextChangeEmpty.cmake -@@ -0,0 +1,3 @@ -+set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") -+file(WRITE "${f}" "Not a binary.\n") -+file(RPATH_CHANGE FILE "${f}" OLD_RPATH "/old/rpath" NEW_RPATH "") -diff --git a/Tests/RunCMake/file-RPATH/TextCheck.cmake b/Tests/RunCMake/file-RPATH/TextCheck.cmake -new file mode 100644 -index 0000000000..1f21ba73cd ---- /dev/null -+++ b/Tests/RunCMake/file-RPATH/TextCheck.cmake -@@ -0,0 +1,6 @@ -+set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") -+file(WRITE "${f}" "Not a binary.\n") -+file(RPATH_CHECK FILE "${f}" RPATH "/some/rpath") -+if(EXISTS "${f}") -+ message(FATAL_ERROR "RPATH_CHECK did not remove\n ${f}\nfor non-empty RPATH") -+endif() -diff --git a/Tests/RunCMake/file-RPATH/TextCheckEmpty.cmake b/Tests/RunCMake/file-RPATH/TextCheckEmpty.cmake -new file mode 100644 -index 0000000000..806c73dae7 ---- /dev/null -+++ b/Tests/RunCMake/file-RPATH/TextCheckEmpty.cmake -@@ -0,0 +1,6 @@ -+set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") -+file(WRITE "${f}" "Not a binary.\n") -+file(RPATH_CHECK FILE "${f}" RPATH "") -+if(NOT EXISTS "${f}") -+ message(FATAL_ERROR "RPATH_CHECK removed\n ${f}\nfor empty RPATH") -+endif() -diff --git a/Tests/RunCMake/file-RPATH/TextRemove.cmake b/Tests/RunCMake/file-RPATH/TextRemove.cmake -new file mode 100644 -index 0000000000..aecaf6f436 ---- /dev/null -+++ b/Tests/RunCMake/file-RPATH/TextRemove.cmake -@@ -0,0 +1,3 @@ -+set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") -+file(WRITE "${f}" "Not a binary.\n") -+file(RPATH_REMOVE FILE "${f}") -diff --git a/Tests/RunCMake/file-RPATH/TextSet-result.txt b/Tests/RunCMake/file-RPATH/TextSet-result.txt -new file mode 100644 -index 0000000000..d00491fd7e ---- /dev/null -+++ b/Tests/RunCMake/file-RPATH/TextSet-result.txt -@@ -0,0 +1 @@ -+1 -diff --git a/Tests/RunCMake/file-RPATH/TextSet-stderr.txt b/Tests/RunCMake/file-RPATH/TextSet-stderr.txt -new file mode 100644 -index 0000000000..811c9a5bfc ---- /dev/null -+++ b/Tests/RunCMake/file-RPATH/TextSet-stderr.txt -@@ -0,0 +1,12 @@ -+^CMake Error at [^ -+]*/Tests/RunCMake/file-RPATH/TextSet.cmake:[0-9]+ \(file\): -+ file RPATH_SET could not write new RPATH: -+ -+ /new/rpath -+ -+ to the file: -+ -+ [^ -+]*/Tests/RunCMake/file-RPATH/TextSet-build/not_a_binary.txt -+ -+ The file format is not recognized\.$ -diff --git a/Tests/RunCMake/file-RPATH/TextSet.cmake b/Tests/RunCMake/file-RPATH/TextSet.cmake -new file mode 100644 -index 0000000000..f4b09d248c ---- /dev/null -+++ b/Tests/RunCMake/file-RPATH/TextSet.cmake -@@ -0,0 +1,3 @@ -+set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") -+file(WRITE "${f}" "Not a binary.\n") -+file(RPATH_SET FILE "${f}" NEW_RPATH "/new/rpath") -diff --git a/Tests/RunCMake/file-RPATH/TextSetEmpty.cmake b/Tests/RunCMake/file-RPATH/TextSetEmpty.cmake -new file mode 100644 -index 0000000000..d9517e08c6 ---- /dev/null -+++ b/Tests/RunCMake/file-RPATH/TextSetEmpty.cmake -@@ -0,0 +1,3 @@ -+set(f "${CMAKE_CURRENT_BINARY_DIR}/not_a_binary.txt") -+file(WRITE "${f}" "Not a binary.\n") -+file(RPATH_SET FILE "${f}" NEW_RPATH "") diff --git a/cmake-3.22.0-rhbz2027118.patch b/cmake-3.22.0-rhbz2027118.patch deleted file mode 100644 index 5222d1a..0000000 --- a/cmake-3.22.0-rhbz2027118.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7896991af029d66c9e1692ce18027fafaa0e9bd8 Mon Sep 17 00:00:00 2001 -From: Robert Maynard -Date: Mon, 29 Nov 2021 13:47:16 -0500 -Subject: [PATCH] GNUInstallDirs: Prefer system lib64 over conda lib when - ambiguous - -Update logic added by commit ecaca8c129 (GNUInstallDirs now aware of -conda lib directory requirements, 2021-09-08, v3.22.0-rc1~142^2). -When it is ambiguous if we are doing a conda install or a system -install prefer using the system library directory. - -Fixes: #22962 ---- - Modules/GNUInstallDirs.cmake | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake -index 6ca424ad5d..01bd63716c 100644 ---- a/Modules/GNUInstallDirs.cmake -+++ b/Modules/GNUInstallDirs.cmake -@@ -253,7 +253,9 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set - elseif(DEFINED ENV{CONDA_PREFIX}) - set(conda_prefix "$ENV{CONDA_PREFIX}") - cmake_path(ABSOLUTE_PATH conda_prefix NORMALIZE) -- if("${CMAKE_INSTALL_PREFIX}" STREQUAL conda_prefix) -+ if("${CMAKE_INSTALL_PREFIX}" STREQUAL conda_prefix AND -+ NOT ("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$" OR -+ "${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$")) - set(__system_type_for_install "conda") - endif() - endif() --- -GitLab - diff --git a/cmake.spec b/cmake.spec index 1dd7172..8ab118e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,14 +68,14 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 4 +%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}.0 +Version: %{major_version}.%{minor_version}.1 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -109,11 +109,6 @@ Patch101: %{name}-fedora-flag_release.patch # Add dl to CMAKE_DL_LIBS on MINGW # https://gitlab.kitware.com/cmake/cmake/issues/17600 Patch102: %{name}-mingw-dl.patch -# rhbz#2027118 -# https://gitlab.kitware.com/cmake/cmake/-/issues/22962 -Patch103: https://gitlab.kitware.com/cmake/cmake/-/commit/7896991af029d66c9e1692ce18027fafaa0e9bd8.patch#/%{name}-3.22.0-rhbz2027118.patch -# https://gitlab.kitware.com/cmake/cmake/-/issues/22963 -Patch104: 0001-Merge-topic-rpath-unrecognized-format-into-release-3.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -531,6 +526,10 @@ popd %changelog +* Tue Dec 07 2021 Björn Esser - 3.22.1-1 +- cmake-3.22.1 + Fixes rhbz#2029974 + * Thu Dec 02 2021 Stephan Bergmann - 3.22.0-4 - Fixes RPATH_CHANGE fails when shared object is a GNU ld script diff --git a/sources b/sources index 2078af1..7479ea6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.22.0.tar.gz) = 72e4e39bfd0a918572228af68391422979f89a0a5020fae7764b5d7ba86a7a56e8174e22f1b0ffeb37b741c0a6118162a2a47655a03939ea0535453186ed385c +SHA512 (cmake-3.22.1.tar.gz) = b1e900fe573cd1cc76d26386f2298d7722737c9ff67930ee108994972b4561ef69caeb537177c9b95b7f17b755e20e034825d3807ea0d2dd4c391310b03adc11 From d15cbd20cebd84e41348b92cc88dee4a730a8e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Thu, 16 Dec 2021 12:10:03 +0100 Subject: [PATCH 091/238] Backport upstream patch to add support to Python 3.11 --- 0003-Add-support-for-Python-3.11.patch | 53 ++++++++++++++++++++++++++ cmake.spec | 8 +++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 0003-Add-support-for-Python-3.11.patch diff --git a/0003-Add-support-for-Python-3.11.patch b/0003-Add-support-for-Python-3.11.patch new file mode 100644 index 0000000..c16f9e3 --- /dev/null +++ b/0003-Add-support-for-Python-3.11.patch @@ -0,0 +1,53 @@ +From 376486c942ab4afc27150d938c1482c1d0000c42 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= +Date: Tue, 7 Dec 2021 13:34:24 +0100 +Subject: [PATCH] Add support for Python 3.11 + +--- + Modules/FindPython/Support.cmake | 2 +- + Modules/FindPythonInterp.cmake | 2 +- + Modules/FindPythonLibs.cmake | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake +index ce25cfc7..b7a0ef6b 100644 +--- a/Modules/FindPython/Support.cmake ++++ b/Modules/FindPython/Support.cmake +@@ -22,7 +22,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR) + message (FATAL_ERROR "FindPython: INTERNAL ERROR") + endif() + if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3") +- set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++ set(_${_PYTHON_PREFIX}_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2") + set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) + else() +diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake +index efe0f119..4fc40c89 100644 +--- a/Modules/FindPythonInterp.cmake ++++ b/Modules/FindPythonInterp.cmake +@@ -54,7 +54,7 @@ unset(_Python_NAMES) + + set(_PYTHON1_VERSIONS 1.6 1.5) + set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) +-set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + + if(PythonInterp_FIND_VERSION) + if(PythonInterp_FIND_VERSION_COUNT GREATER 1) +diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake +index 396f0d2e..c0caf347 100644 +--- a/Modules/FindPythonLibs.cmake ++++ b/Modules/FindPythonLibs.cmake +@@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST) + + set(_PYTHON1_VERSIONS 1.6 1.5) + set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) +-set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + + if(PythonLibs_FIND_VERSION) + if(PythonLibs_FIND_VERSION_COUNT GREATER 1) +-- +2.33.1 + diff --git a/cmake.spec b/cmake.spec index 8ab118e..8443107 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,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} @@ -109,6 +109,9 @@ Patch101: %{name}-fedora-flag_release.patch # Add dl to CMAKE_DL_LIBS on MINGW # https://gitlab.kitware.com/cmake/cmake/issues/17600 Patch102: %{name}-mingw-dl.patch +# Add support for Python 3.11 (merged in upstream) +# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6792 +Patch103: 0003-Add-support-for-Python-3.11.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -526,6 +529,9 @@ popd %changelog +* Thu Dec 16 2021 Tomáš Hrnčiar - 3.22.1-2 +- Backport patch to add Python 3.11 support + * Tue Dec 07 2021 Björn Esser - 3.22.1-1 - cmake-3.22.1 Fixes rhbz#2029974 From 1ddd4423bae9347535f7427809f87d4bdbde56de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 16 Dec 2021 16:46:40 +0100 Subject: [PATCH 092/238] Backport patch to add Boost 1.78 support --- ...FindBoost-Add-support-for-Boost-1.78.patch | 74 +++++++++++++++++++ cmake.spec | 8 +- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 0004-FindBoost-Add-support-for-Boost-1.78.patch diff --git a/0004-FindBoost-Add-support-for-Boost-1.78.patch b/0004-FindBoost-Add-support-for-Boost-1.78.patch new file mode 100644 index 0000000..a90e96b --- /dev/null +++ b/0004-FindBoost-Add-support-for-Boost-1.78.patch @@ -0,0 +1,74 @@ +From d176ff71c03f62d993d2fbad6aa416e64e336453 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Wed, 15 Dec 2021 10:16:59 -0500 +Subject: [PATCH 3/3] FindBoost: Add support for Boost 1.78 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Update the list of known versions. + +Run the command + + cmake -DBOOST_DIR=/path/to/boost_1_78_0 \ + -P Utilities/Scripts/BoostScanDeps.cmake + +to extract dependencies from the 1.78.0 source tree. + +The dependencies differ from those of 1.77: + +* The `log` component no longer depends on `date_time`. + +Fixes: #23016 +Signed-off-by: Björn Esser +--- + Modules/FindBoost.cmake | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake +index 38faca24aa..0ad342f0e6 100644 +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -1350,7 +1350,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + set(_Boost_TIMER_DEPENDENCIES chrono) + set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) +- else() ++ elseif(Boost_VERSION_STRING VERSION_LESS 1.78.0) + set(_Boost_CONTRACT_DEPENDENCIES thread chrono) + set(_Boost_COROUTINE_DEPENDENCIES context) + set(_Boost_FIBER_DEPENDENCIES context) +@@ -1365,6 +1365,21 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + set(_Boost_TIMER_DEPENDENCIES chrono) + set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) ++ else() ++ set(_Boost_CONTRACT_DEPENDENCIES thread chrono) ++ set(_Boost_COROUTINE_DEPENDENCIES context) ++ set(_Boost_FIBER_DEPENDENCIES context) ++ set(_Boost_IOSTREAMS_DEPENDENCIES regex) ++ set(_Boost_JSON_DEPENDENCIES container) ++ set(_Boost_LOG_DEPENDENCIES log_setup filesystem thread regex chrono atomic) ++ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l) ++ set(_Boost_MPI_DEPENDENCIES serialization) ++ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization) ++ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version}) ++ set(_Boost_THREAD_DEPENDENCIES chrono atomic) ++ set(_Boost_TIMER_DEPENDENCIES chrono) ++ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) ++ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) + if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.78.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) + message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") + endif() +@@ -1638,7 +1653,7 @@ else() + # _Boost_COMPONENT_HEADERS. See the instructions at the top of + # _Boost_COMPONENT_DEPENDENCIES. + set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} +- "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" ++ "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" + "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" + "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" + "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" +-- +2.33.1 + diff --git a/cmake.spec b/cmake.spec index 8443107..336a539 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -112,6 +112,9 @@ Patch102: %{name}-mingw-dl.patch # Add support for Python 3.11 (merged in upstream) # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6792 Patch103: 0003-Add-support-for-Python-3.11.patch +# Add support for Boost 1.78 (merged in upstream) +# https://gitlab.kitware.com/cmake/cmake/-/issues/23016 +Patch104: 0004-FindBoost-Add-support-for-Boost-1.78.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -529,6 +532,9 @@ popd %changelog +* Thu Dec 16 2021 Björn Esser - 3.22.1-3 +- Backport patch to add Boost 1.78 support + * Thu Dec 16 2021 Tomáš Hrnčiar - 3.22.1-2 - Backport patch to add Python 3.11 support From c106851f54346b70f3fb8a9c9142ec9fdef66280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 17 Dec 2021 23:56:43 +0100 Subject: [PATCH 093/238] Backport patch to add support for Python >= 3.10 in FindBoost.cmake --- ...indBoost-Add-support-for-Python-3.10.patch | 78 +++++++++++++++++++ cmake.spec | 8 +- 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 0005-FindBoost-Add-support-for-Python-3.10.patch diff --git a/0005-FindBoost-Add-support-for-Python-3.10.patch b/0005-FindBoost-Add-support-for-Python-3.10.patch new file mode 100644 index 0000000..6d0322d --- /dev/null +++ b/0005-FindBoost-Add-support-for-Python-3.10.patch @@ -0,0 +1,78 @@ +From d4bb6c0c7fe8e3ee5aaa275cf939d074f959119b Mon Sep 17 00:00:00 2001 +From: Oleg Sidorkin +Date: Thu, 16 Dec 2021 21:24:00 +0300 +Subject: [PATCH 6/6] FindBoost: Add support for Python 3.10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Regexps in FindBoost assumed that python's minor version had only one +digit. That became not true for 3.10. + +Fixes: #23025 +Signed-off-by: Björn Esser +--- + Modules/FindBoost.cmake | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake +index 0ad342f0e6..75cbbf56bc 100644 +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -390,7 +390,7 @@ cmake_policy(SET CMP0102 NEW) # if mark_as_advanced(non_cache_var) + + function(_boost_get_existing_target component target_var) + set(names "${component}") +- if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9])?$") ++ if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9]+)?$") + # handle pythonXY and numpyXY versioned components and also python X.Y, mpi_python etc. + list(APPEND names + "${CMAKE_MATCH_1}${CMAKE_MATCH_2}" # python +@@ -407,7 +407,7 @@ function(_boost_get_existing_target component target_var) + if(TARGET "${prefix}::${name}") + # The target may be an INTERFACE library that wraps around a single other + # target for compatibility. Unwrap this layer so we can extract real info. +- if("${name}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$") ++ if("${name}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9]+)$") + set(name_nv "${CMAKE_MATCH_1}") + if(TARGET "${prefix}::${name_nv}") + get_property(type TARGET "${prefix}::${name}" PROPERTY TYPE) +@@ -430,7 +430,7 @@ endfunction() + + function(_boost_get_canonical_target_name component target_var) + string(TOLOWER "${component}" component) +- if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9])?$") ++ if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9]+)?$") + # handle pythonXY and numpyXY versioned components and also python X.Y, mpi_python etc. + set(${target_var} "Boost::${CMAKE_MATCH_1}${CMAKE_MATCH_2}" PARENT_SCOPE) + else() +@@ -1004,7 +1004,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + # against the new release. + + # Handle Python version suffixes +- if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9])\$") ++ if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9]+)\$") + set(component "${CMAKE_MATCH_1}") + set(component_python_version "${CMAKE_MATCH_2}") + endif() +@@ -1408,7 +1408,7 @@ endfunction() + # + function(_Boost_COMPONENT_HEADERS component _hdrs) + # Handle Python version suffixes +- if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9])\$") ++ if(component MATCHES "^(python|mpi_python|numpy)([0-9]+|[0-9]\\.[0-9]+)\$") + set(component "${CMAKE_MATCH_1}") + set(component_python_version "${CMAKE_MATCH_2}") + endif() +@@ -2165,7 +2165,7 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) + if(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\$") + set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") + set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") +- elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$") ++ elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9]+)\$") + set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") + set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") + set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}") +-- +2.33.1 + diff --git a/cmake.spec b/cmake.spec index 336a539..82da0fc 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -115,6 +115,9 @@ Patch103: 0003-Add-support-for-Python-3.11.patch # Add support for Boost 1.78 (merged in upstream) # https://gitlab.kitware.com/cmake/cmake/-/issues/23016 Patch104: 0004-FindBoost-Add-support-for-Boost-1.78.patch +# FindBoost: Add support for Python >= 3.10 (merged in upstream) +# https://gitlab.kitware.com/cmake/cmake/-/issues/23025 +Patch105: 0005-FindBoost-Add-support-for-Python-3.10.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -532,6 +535,9 @@ popd %changelog +* Fri Dec 17 2021 Björn Esser - 3.22.1-4 +- Backport patch to add support for Python >= 3.10 in FindBoost.cmake + * Thu Dec 16 2021 Björn Esser - 3.22.1-3 - Backport patch to add Boost 1.78 support From 4663bf397a217ca93077d37d974aaf80cb435b47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 26 Dec 2021 16:48:34 +0100 Subject: [PATCH 094/238] Backport two patches fixing regressions in FindBoost and FindGLUT --- ...-warn-about-now-supported-version-1..patch | 33 ++++++++++++ ...-legacy-GLUT_INCLUDE_DIR-result-in-p.patch | 54 +++++++++++++++++++ cmake.spec | 11 +++- 3 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 0006-FindBoost-Do-not-warn-about-now-supported-version-1..patch create mode 100644 0007-FindGLUT-Provide-legacy-GLUT_INCLUDE_DIR-result-in-p.patch diff --git a/0006-FindBoost-Do-not-warn-about-now-supported-version-1..patch b/0006-FindBoost-Do-not-warn-about-now-supported-version-1..patch new file mode 100644 index 0000000..3464069 --- /dev/null +++ b/0006-FindBoost-Do-not-warn-about-now-supported-version-1..patch @@ -0,0 +1,33 @@ +From d45667d45943e1b768b25921f8e481cfafa487a4 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Mon, 20 Dec 2021 09:03:05 -0500 +Subject: [PATCH 8/9] FindBoost: Do not warn about now-supported version 1.78 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In commit d176ff71c0 (FindBoost: Add support for Boost 1.78, 2021-12-15) +we forgot to update the future-version check. + +Issue: #23016 +Signed-off-by: Björn Esser +--- + Modules/FindBoost.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake +index 75cbbf56bc..c3142d66aa 100644 +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -1380,7 +1380,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + set(_Boost_TIMER_DEPENDENCIES chrono) + set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) +- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.78.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) ++ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.79.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) + message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") + endif() + endif() +-- +2.33.1 + diff --git a/0007-FindGLUT-Provide-legacy-GLUT_INCLUDE_DIR-result-in-p.patch b/0007-FindGLUT-Provide-legacy-GLUT_INCLUDE_DIR-result-in-p.patch new file mode 100644 index 0000000..ef0eb29 --- /dev/null +++ b/0007-FindGLUT-Provide-legacy-GLUT_INCLUDE_DIR-result-in-p.patch @@ -0,0 +1,54 @@ +From ae6b25d920325585f0e7f56d23d2b0f8e0b39af8 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Fri, 17 Dec 2021 12:59:51 -0500 +Subject: [PATCH 7/9] FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in + pkg-config code path +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if +available, 2021-06-11, v3.22.0-rc1~469^2) we return early if pkg-config +provides the information. During review of that commit, code to +populate the legacy `GLUT_INCLUDE_DIR` result variable was removed from +that code path. Add code to provide it. + +Also fix the test case to use `GLUT_INCLUDE_DIR`, the result variable +documented officially by the module. + +Fixes: #23018 +Signed-off-by: Björn Esser +--- + Modules/FindGLUT.cmake | 2 ++ + Tests/FindGLUT/Test/CMakeLists.txt | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake +index dd0975d395..636f1ea3b1 100644 +--- a/Modules/FindGLUT.cmake ++++ b/Modules/FindGLUT.cmake +@@ -71,6 +71,8 @@ find_package(PkgConfig) + if(PKG_CONFIG_FOUND) + pkg_check_modules(GLUT glut) + if(GLUT_FOUND) ++ # In the non-pkg-config code path we only provide GLUT_INCLUDE_DIR. ++ set(GLUT_INCLUDE_DIR "${GLUT_INCLUDE_DIRS}") + _add_glut_target_simple() + FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLUT REQUIRED_VARS GLUT_FOUND) + return() +diff --git a/Tests/FindGLUT/Test/CMakeLists.txt b/Tests/FindGLUT/Test/CMakeLists.txt +index 0f4e536739..f6440b250f 100644 +--- a/Tests/FindGLUT/Test/CMakeLists.txt ++++ b/Tests/FindGLUT/Test/CMakeLists.txt +@@ -9,7 +9,7 @@ target_link_libraries(testglut_tgt GLUT::GLUT) + add_test(NAME testglut_tgt COMMAND testglut_tgt) + + add_executable(testglut_var main.c) +-target_include_directories(testglut_var PRIVATE ${GLUT_INCLUDE_DIRS}) ++target_include_directories(testglut_var PRIVATE ${GLUT_INCLUDE_DIR}) + target_link_libraries(testglut_var PRIVATE ${GLUT_LIBRARIES}) + add_test(NAME testglut_var COMMAND testglut_var) + +-- +2.33.1 + diff --git a/cmake.spec b/cmake.spec index 82da0fc..eb935ca 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 4 +%global baserelease 5 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -118,6 +118,12 @@ Patch104: 0004-FindBoost-Add-support-for-Boost-1.78.patch # FindBoost: Add support for Python >= 3.10 (merged in upstream) # https://gitlab.kitware.com/cmake/cmake/-/issues/23025 Patch105: 0005-FindBoost-Add-support-for-Python-3.10.patch +# FindBoost: Do not warn about now-supported version 1.78 (merged in upstream) +# https://gitlab.kitware.com/cmake/cmake/-/issues/23016 +Patch106: 0006-FindBoost-Do-not-warn-about-now-supported-version-1..patch +# FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path (merged in upstream) +# https://gitlab.kitware.com/cmake/cmake/-/issues/23018 +Patch107: 0007-FindGLUT-Provide-legacy-GLUT_INCLUDE_DIR-result-in-p.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -535,6 +541,9 @@ popd %changelog +* Sun Dec 26 2021 Björn Esser - 3.22.1-5 +- Backport two patches fixing regressions in FindBoost and FindGLUT + * Fri Dec 17 2021 Björn Esser - 3.22.1-4 - Backport patch to add support for Python >= 3.10 in FindBoost.cmake From 8ae403196d1414744515e925e22134ba723e2dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 19 Jan 2022 18:14:46 +0100 Subject: [PATCH 095/238] Add patch to fix compatibility of FortranCInterface with GCC gfortran 12 LTO Fixes rhbz#2041904 --- ...e-Fix-compatibility-with-GCC-gfortra.patch | 49 +++++++++++++++++++ cmake.spec | 10 +++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch diff --git a/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch b/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch new file mode 100644 index 0000000..cb1f4bc --- /dev/null +++ b/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch @@ -0,0 +1,49 @@ +From 5ec4aa48f7fb0a6ab4b1385e5512527ecb24f588 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Wed, 19 Jan 2022 17:26:14 +0100 +Subject: [PATCH] FortranCInterface: Fix compatibility with GCC gfortran 12 LTO +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since version 12.0 the GCC Fortran compiler has implemented "WG5/N1942", +which causes, if link-time opmization is enabled, obfuscation of hard-coded +string values in the compiler objects and its resulting ELF-binaries. + +This causes the CMake-internal detection of the mangling scheme for the +naming of subroutines to fail. Thus we must ensure to have any link-time +optimization features to be disabled on the executable file we perform the +detection on. + +Fixes: #23123 + +Signed-off-by: Björn Esser +--- + Modules/FortranCInterface/CMakeLists.txt | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/Modules/FortranCInterface/CMakeLists.txt b/Modules/FortranCInterface/CMakeLists.txt +index 13e4498ad9..6bbb753042 100644 +--- a/Modules/FortranCInterface/CMakeLists.txt ++++ b/Modules/FortranCInterface/CMakeLists.txt +@@ -5,6 +5,17 @@ cmake_minimum_required(VERSION ${CMAKE_VERSION}) + project(FortranCInterface C Fortran) + include(${FortranCInterface_BINARY_DIR}/Input.cmake OPTIONAL) + ++# If IPO is enabled here, GCC gfortran >= 12.0 will obfuscate ++# the strings of the return values in the compiled executable, ++# which we use to regex match against later. ++if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND ++ CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 12) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-lto") ++ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fno-lto") ++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-lto") ++ set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -fno-lto") ++endif() ++ + # Check if the C compiler supports '$' in identifiers. + include(CheckCSourceCompiles) + check_c_source_compiles(" +-- +2.34.1 + diff --git a/cmake.spec b/cmake.spec index eb935ca..45dff6b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 5 +%global baserelease 6 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -124,6 +124,10 @@ Patch106: 0006-FindBoost-Do-not-warn-about-now-supported-version-1..patch # FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path (merged in upstream) # https://gitlab.kitware.com/cmake/cmake/-/issues/23018 Patch107: 0007-FindGLUT-Provide-legacy-GLUT_INCLUDE_DIR-result-in-p.patch +# FortranCInterface: Fix compatibility with GCC gfortran 12 LTO (proposed PR upstream) +# https://bugzilla.redhat.com/show_bug.cgi?id=2041904 +# https://gitlab.kitware.com/cmake/cmake/-/issues/23123 +Patch108: 0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -541,6 +545,10 @@ popd %changelog +* Wed Jan 19 2022 Björn Esser - 3.22.1-6 +- Add patch to fix compatibility of FortranCInterface with GCC gfortran 12 LTO + Fixes rhbz#2041904 + * Sun Dec 26 2021 Björn Esser - 3.22.1-5 - Backport two patches fixing regressions in FindBoost and FindGLUT From a45177485241fcaf645d828176507c604a259ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 19 Jan 2022 18:45:40 +0100 Subject: [PATCH 096/238] Update Patch108 with upstreamed version --- ...face-Fix-compatibility-with-GCC-gfortra.patch | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch b/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch index cb1f4bc..398f20d 100644 --- a/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch +++ b/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch @@ -1,4 +1,4 @@ -From 5ec4aa48f7fb0a6ab4b1385e5512527ecb24f588 Mon Sep 17 00:00:00 2001 +From 537d964fab8b3f524eb3622c53f22279ea14fd62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 19 Jan 2022 17:26:14 +0100 Subject: [PATCH] FortranCInterface: Fix compatibility with GCC gfortran 12 LTO @@ -19,14 +19,14 @@ Fixes: #23123 Signed-off-by: Björn Esser --- - Modules/FortranCInterface/CMakeLists.txt | 11 +++++++++++ - 1 file changed, 11 insertions(+) + Modules/FortranCInterface/CMakeLists.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) diff --git a/Modules/FortranCInterface/CMakeLists.txt b/Modules/FortranCInterface/CMakeLists.txt -index 13e4498ad9..6bbb753042 100644 +index 13e4498ad9..f21b92fc54 100644 --- a/Modules/FortranCInterface/CMakeLists.txt +++ b/Modules/FortranCInterface/CMakeLists.txt -@@ -5,6 +5,17 @@ cmake_minimum_required(VERSION ${CMAKE_VERSION}) +@@ -5,6 +5,15 @@ cmake_minimum_required(VERSION ${CMAKE_VERSION}) project(FortranCInterface C Fortran) include(${FortranCInterface_BINARY_DIR}/Input.cmake OPTIONAL) @@ -35,10 +35,8 @@ index 13e4498ad9..6bbb753042 100644 +# which we use to regex match against later. +if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND + CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 12) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-lto") -+ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fno-lto") -+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-lto") -+ set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -fno-lto") ++ string(APPEND CMAKE_C_FLAGS " -fno-lto") ++ string(APPEND CMAKE_Fortran_FLAGS " -fno-lto") +endif() + # Check if the C compiler supports '$' in identifiers. From 41dff1ec885f8177f325a3f78f3ca834a5d0f88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 19 Jan 2022 19:41:48 +0100 Subject: [PATCH 097/238] Skip tests failing with GCC 12 --- cmake.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake.spec b/cmake.spec index 45dff6b..b49f628 100644 --- a/cmake.spec +++ b/cmake.spec @@ -465,6 +465,9 @@ pushd %{_vpath_builddir} # CTestTestUpload require internet access # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983 NO_TEST="CTestTestUpload" +# Likely failing for GCC 12 +NO_TEST="$NO_TEST|CustomCommand|CMakeLib.testCTestResourceAllocator" +NO_TEST="$NO_TEST|CMakeLib.testCTestResourceSpec|RunCMake.PositionIndependentCode" # kwsys.testProcess-{4,5} are flaky on s390x. %ifarch s390x NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" @@ -548,6 +551,7 @@ popd * Wed Jan 19 2022 Björn Esser - 3.22.1-6 - Add patch to fix compatibility of FortranCInterface with GCC gfortran 12 LTO Fixes rhbz#2041904 +- Skip tests failing with GCC 12 * Sun Dec 26 2021 Björn Esser - 3.22.1-5 - Backport two patches fixing regressions in FindBoost and FindGLUT From 2b6e5b1d85f41be6b0d4b59cc704d4ee657c3a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 19 Jan 2022 20:51:21 +0100 Subject: [PATCH 098/238] Update Patch108 with upstreamed version --- ...e-Fix-compatibility-with-GCC-gfortra.patch | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch b/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch index 398f20d..92b0b8d 100644 --- a/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch +++ b/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch @@ -1,4 +1,4 @@ -From 537d964fab8b3f524eb3622c53f22279ea14fd62 Mon Sep 17 00:00:00 2001 +From 6a0ce19ce1cb594cdec19bacc9fc7a38156e38da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 19 Jan 2022 17:26:14 +0100 Subject: [PATCH] FortranCInterface: Fix compatibility with GCC gfortran 12 LTO @@ -15,33 +15,41 @@ naming of subroutines to fail. Thus we must ensure to have any link-time optimization features to be disabled on the executable file we perform the detection on. +The static libraries, however, must be build with LTO and non-LTO objects, +as that will ensure the verify step will operate on IPO objects, if building +those is requested by the system compiler flags. + Fixes: #23123 Signed-off-by: Björn Esser --- - Modules/FortranCInterface/CMakeLists.txt | 9 +++++++++ - 1 file changed, 9 insertions(+) + Modules/FortranCInterface/CMakeLists.txt | 13 +++++++++++++ + 1 file changed, 13 insertions(+) diff --git a/Modules/FortranCInterface/CMakeLists.txt b/Modules/FortranCInterface/CMakeLists.txt -index 13e4498ad9..f21b92fc54 100644 +index 13e4498ad9..ce0bc10c8e 100644 --- a/Modules/FortranCInterface/CMakeLists.txt +++ b/Modules/FortranCInterface/CMakeLists.txt -@@ -5,6 +5,15 @@ cmake_minimum_required(VERSION ${CMAKE_VERSION}) - project(FortranCInterface C Fortran) - include(${FortranCInterface_BINARY_DIR}/Input.cmake OPTIONAL) +@@ -102,6 +102,19 @@ set_property(TARGET symbols PROPERTY POSITION_INDEPENDENT_CODE 1) + add_executable(FortranCInterface main.F call_sub.f ${call_mod}) + target_link_libraries(FortranCInterface PUBLIC symbols) +# If IPO is enabled here, GCC gfortran >= 12.0 will obfuscate +# the strings of the return values in the compiled executable, +# which we use to regex match against later. ++# The static libraries must be build with IPO and non-IPO objects, ++# as that will ensure the verify step will operate on IPO objects, ++# if requested by the system compiler flags. +if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND + CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 12) -+ string(APPEND CMAKE_C_FLAGS " -fno-lto") -+ string(APPEND CMAKE_Fortran_FLAGS " -fno-lto") ++ target_compile_options(FortranCInterface PRIVATE "-fno-lto") ++ target_compile_options(myfort PRIVATE "-flto=auto" "-ffat-lto-objects") ++ target_compile_options(symbols PRIVATE "-flto=auto" "-ffat-lto-objects") +endif() + - # Check if the C compiler supports '$' in identifiers. - include(CheckCSourceCompiles) - check_c_source_compiles(" + file(GENERATE OUTPUT exe-$.cmake CONTENT [[ + set(FortranCInterface_EXE "$") + ]]) -- 2.34.1 From e4e979aeddb195ad2c11722989279e3d4630b385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 20 Jan 2022 14:17:25 +0100 Subject: [PATCH 099/238] Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index b49f628..e822b3d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 6 +%global baserelease 7 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -548,6 +548,9 @@ popd %changelog +* Thu Jan 20 2022 Björn Esser - 3.22.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jan 19 2022 Björn Esser - 3.22.1-6 - Add patch to fix compatibility of FortranCInterface with GCC gfortran 12 LTO Fixes rhbz#2041904 From b707c6805c43f1bc40bea19aa9a8fd8aefdfb3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 25 Jan 2022 17:10:43 +0100 Subject: [PATCH 100/238] cmake-3.22.2 Fixes rhbz#2045074 --- 0003-Add-support-for-Python-3.11.patch | 53 ------------- ...FindBoost-Add-support-for-Boost-1.78.patch | 74 ------------------ ...indBoost-Add-support-for-Python-3.10.patch | 78 ------------------- ...-warn-about-now-supported-version-1..patch | 33 -------- ...-legacy-GLUT_INCLUDE_DIR-result-in-p.patch | 54 ------------- ...e-Fix-compatibility-with-GCC-gfortra.patch | 55 ------------- cmake.spec | 27 ++----- sources | 2 +- 8 files changed, 7 insertions(+), 369 deletions(-) delete mode 100644 0003-Add-support-for-Python-3.11.patch delete mode 100644 0004-FindBoost-Add-support-for-Boost-1.78.patch delete mode 100644 0005-FindBoost-Add-support-for-Python-3.10.patch delete mode 100644 0006-FindBoost-Do-not-warn-about-now-supported-version-1..patch delete mode 100644 0007-FindGLUT-Provide-legacy-GLUT_INCLUDE_DIR-result-in-p.patch delete mode 100644 0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch diff --git a/0003-Add-support-for-Python-3.11.patch b/0003-Add-support-for-Python-3.11.patch deleted file mode 100644 index c16f9e3..0000000 --- a/0003-Add-support-for-Python-3.11.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 376486c942ab4afc27150d938c1482c1d0000c42 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= -Date: Tue, 7 Dec 2021 13:34:24 +0100 -Subject: [PATCH] Add support for Python 3.11 - ---- - Modules/FindPython/Support.cmake | 2 +- - Modules/FindPythonInterp.cmake | 2 +- - Modules/FindPythonLibs.cmake | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake -index ce25cfc7..b7a0ef6b 100644 ---- a/Modules/FindPython/Support.cmake -+++ b/Modules/FindPython/Support.cmake -@@ -22,7 +22,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR) - message (FATAL_ERROR "FindPython: INTERNAL ERROR") - endif() - if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3") -- set(_${_PYTHON_PREFIX}_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+ set(_${_PYTHON_PREFIX}_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2") - set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) - else() -diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake -index efe0f119..4fc40c89 100644 ---- a/Modules/FindPythonInterp.cmake -+++ b/Modules/FindPythonInterp.cmake -@@ -54,7 +54,7 @@ unset(_Python_NAMES) - - set(_PYTHON1_VERSIONS 1.6 1.5) - set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) --set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(PythonInterp_FIND_VERSION) - if(PythonInterp_FIND_VERSION_COUNT GREATER 1) -diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake -index 396f0d2e..c0caf347 100644 ---- a/Modules/FindPythonLibs.cmake -+++ b/Modules/FindPythonLibs.cmake -@@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST) - - set(_PYTHON1_VERSIONS 1.6 1.5) - set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) --set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(PythonLibs_FIND_VERSION) - if(PythonLibs_FIND_VERSION_COUNT GREATER 1) --- -2.33.1 - diff --git a/0004-FindBoost-Add-support-for-Boost-1.78.patch b/0004-FindBoost-Add-support-for-Boost-1.78.patch deleted file mode 100644 index a90e96b..0000000 --- a/0004-FindBoost-Add-support-for-Boost-1.78.patch +++ /dev/null @@ -1,74 +0,0 @@ -From d176ff71c03f62d993d2fbad6aa416e64e336453 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Wed, 15 Dec 2021 10:16:59 -0500 -Subject: [PATCH 3/3] FindBoost: Add support for Boost 1.78 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Update the list of known versions. - -Run the command - - cmake -DBOOST_DIR=/path/to/boost_1_78_0 \ - -P Utilities/Scripts/BoostScanDeps.cmake - -to extract dependencies from the 1.78.0 source tree. - -The dependencies differ from those of 1.77: - -* The `log` component no longer depends on `date_time`. - -Fixes: #23016 -Signed-off-by: Björn Esser ---- - Modules/FindBoost.cmake | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index 38faca24aa..0ad342f0e6 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -1350,7 +1350,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - set(_Boost_TIMER_DEPENDENCIES chrono) - set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic) - set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) -- else() -+ elseif(Boost_VERSION_STRING VERSION_LESS 1.78.0) - set(_Boost_CONTRACT_DEPENDENCIES thread chrono) - set(_Boost_COROUTINE_DEPENDENCIES context) - set(_Boost_FIBER_DEPENDENCIES context) -@@ -1365,6 +1365,21 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - set(_Boost_TIMER_DEPENDENCIES chrono) - set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) - set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) -+ else() -+ set(_Boost_CONTRACT_DEPENDENCIES thread chrono) -+ set(_Boost_COROUTINE_DEPENDENCIES context) -+ set(_Boost_FIBER_DEPENDENCIES context) -+ set(_Boost_IOSTREAMS_DEPENDENCIES regex) -+ set(_Boost_JSON_DEPENDENCIES container) -+ set(_Boost_LOG_DEPENDENCIES log_setup filesystem thread regex chrono atomic) -+ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l) -+ set(_Boost_MPI_DEPENDENCIES serialization) -+ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization) -+ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version}) -+ set(_Boost_THREAD_DEPENDENCIES chrono atomic) -+ set(_Boost_TIMER_DEPENDENCIES chrono) -+ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) -+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) - if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.78.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) - message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") - endif() -@@ -1638,7 +1653,7 @@ else() - # _Boost_COMPONENT_HEADERS. See the instructions at the top of - # _Boost_COMPONENT_DEPENDENCIES. - set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} -- "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" -+ "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" - "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" - "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" - "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" --- -2.33.1 - diff --git a/0005-FindBoost-Add-support-for-Python-3.10.patch b/0005-FindBoost-Add-support-for-Python-3.10.patch deleted file mode 100644 index 6d0322d..0000000 --- a/0005-FindBoost-Add-support-for-Python-3.10.patch +++ /dev/null @@ -1,78 +0,0 @@ -From d4bb6c0c7fe8e3ee5aaa275cf939d074f959119b Mon Sep 17 00:00:00 2001 -From: Oleg Sidorkin -Date: Thu, 16 Dec 2021 21:24:00 +0300 -Subject: [PATCH 6/6] FindBoost: Add support for Python 3.10 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Regexps in FindBoost assumed that python's minor version had only one -digit. That became not true for 3.10. - -Fixes: #23025 -Signed-off-by: Björn Esser ---- - Modules/FindBoost.cmake | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index 0ad342f0e6..75cbbf56bc 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -390,7 +390,7 @@ cmake_policy(SET CMP0102 NEW) # if mark_as_advanced(non_cache_var) - - function(_boost_get_existing_target component target_var) - set(names "${component}") -- if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9])?$") -+ if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9]+)?$") - # handle pythonXY and numpyXY versioned components and also python X.Y, mpi_python etc. - list(APPEND names - "${CMAKE_MATCH_1}${CMAKE_MATCH_2}" # python -@@ -407,7 +407,7 @@ function(_boost_get_existing_target component target_var) - if(TARGET "${prefix}::${name}") - # The target may be an INTERFACE library that wraps around a single other - # target for compatibility. Unwrap this layer so we can extract real info. -- if("${name}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$") -+ if("${name}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9]+)$") - set(name_nv "${CMAKE_MATCH_1}") - if(TARGET "${prefix}::${name_nv}") - get_property(type TARGET "${prefix}::${name}" PROPERTY TYPE) -@@ -430,7 +430,7 @@ endfunction() - - function(_boost_get_canonical_target_name component target_var) - string(TOLOWER "${component}" component) -- if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9])?$") -+ if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9]+)?$") - # handle pythonXY and numpyXY versioned components and also python X.Y, mpi_python etc. - set(${target_var} "Boost::${CMAKE_MATCH_1}${CMAKE_MATCH_2}" PARENT_SCOPE) - else() -@@ -1004,7 +1004,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - # against the new release. - - # Handle Python version suffixes -- if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9])\$") -+ if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9]+)\$") - set(component "${CMAKE_MATCH_1}") - set(component_python_version "${CMAKE_MATCH_2}") - endif() -@@ -1408,7 +1408,7 @@ endfunction() - # - function(_Boost_COMPONENT_HEADERS component _hdrs) - # Handle Python version suffixes -- if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9])\$") -+ if(component MATCHES "^(python|mpi_python|numpy)([0-9]+|[0-9]\\.[0-9]+)\$") - set(component "${CMAKE_MATCH_1}") - set(component_python_version "${CMAKE_MATCH_2}") - endif() -@@ -2165,7 +2165,7 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - if(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\$") - set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") - set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") -- elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$") -+ elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9]+)\$") - set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") - set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") - set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}") --- -2.33.1 - diff --git a/0006-FindBoost-Do-not-warn-about-now-supported-version-1..patch b/0006-FindBoost-Do-not-warn-about-now-supported-version-1..patch deleted file mode 100644 index 3464069..0000000 --- a/0006-FindBoost-Do-not-warn-about-now-supported-version-1..patch +++ /dev/null @@ -1,33 +0,0 @@ -From d45667d45943e1b768b25921f8e481cfafa487a4 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Mon, 20 Dec 2021 09:03:05 -0500 -Subject: [PATCH 8/9] FindBoost: Do not warn about now-supported version 1.78 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In commit d176ff71c0 (FindBoost: Add support for Boost 1.78, 2021-12-15) -we forgot to update the future-version check. - -Issue: #23016 -Signed-off-by: Björn Esser ---- - Modules/FindBoost.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index 75cbbf56bc..c3142d66aa 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -1380,7 +1380,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - set(_Boost_TIMER_DEPENDENCIES chrono) - set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) - set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) -- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.78.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) -+ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.79.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) - message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") - endif() - endif() --- -2.33.1 - diff --git a/0007-FindGLUT-Provide-legacy-GLUT_INCLUDE_DIR-result-in-p.patch b/0007-FindGLUT-Provide-legacy-GLUT_INCLUDE_DIR-result-in-p.patch deleted file mode 100644 index ef0eb29..0000000 --- a/0007-FindGLUT-Provide-legacy-GLUT_INCLUDE_DIR-result-in-p.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ae6b25d920325585f0e7f56d23d2b0f8e0b39af8 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Fri, 17 Dec 2021 12:59:51 -0500 -Subject: [PATCH 7/9] FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in - pkg-config code path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since commit f90d15458a (FindGLUT: Use pkg-config to find flags if -available, 2021-06-11, v3.22.0-rc1~469^2) we return early if pkg-config -provides the information. During review of that commit, code to -populate the legacy `GLUT_INCLUDE_DIR` result variable was removed from -that code path. Add code to provide it. - -Also fix the test case to use `GLUT_INCLUDE_DIR`, the result variable -documented officially by the module. - -Fixes: #23018 -Signed-off-by: Björn Esser ---- - Modules/FindGLUT.cmake | 2 ++ - Tests/FindGLUT/Test/CMakeLists.txt | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake -index dd0975d395..636f1ea3b1 100644 ---- a/Modules/FindGLUT.cmake -+++ b/Modules/FindGLUT.cmake -@@ -71,6 +71,8 @@ find_package(PkgConfig) - if(PKG_CONFIG_FOUND) - pkg_check_modules(GLUT glut) - if(GLUT_FOUND) -+ # In the non-pkg-config code path we only provide GLUT_INCLUDE_DIR. -+ set(GLUT_INCLUDE_DIR "${GLUT_INCLUDE_DIRS}") - _add_glut_target_simple() - FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLUT REQUIRED_VARS GLUT_FOUND) - return() -diff --git a/Tests/FindGLUT/Test/CMakeLists.txt b/Tests/FindGLUT/Test/CMakeLists.txt -index 0f4e536739..f6440b250f 100644 ---- a/Tests/FindGLUT/Test/CMakeLists.txt -+++ b/Tests/FindGLUT/Test/CMakeLists.txt -@@ -9,7 +9,7 @@ target_link_libraries(testglut_tgt GLUT::GLUT) - add_test(NAME testglut_tgt COMMAND testglut_tgt) - - add_executable(testglut_var main.c) --target_include_directories(testglut_var PRIVATE ${GLUT_INCLUDE_DIRS}) -+target_include_directories(testglut_var PRIVATE ${GLUT_INCLUDE_DIR}) - target_link_libraries(testglut_var PRIVATE ${GLUT_LIBRARIES}) - add_test(NAME testglut_var COMMAND testglut_var) - --- -2.33.1 - diff --git a/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch b/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch deleted file mode 100644 index 92b0b8d..0000000 --- a/0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6a0ce19ce1cb594cdec19bacc9fc7a38156e38da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Wed, 19 Jan 2022 17:26:14 +0100 -Subject: [PATCH] FortranCInterface: Fix compatibility with GCC gfortran 12 LTO -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since version 12.0 the GCC Fortran compiler has implemented "WG5/N1942", -which causes, if link-time opmization is enabled, obfuscation of hard-coded -string values in the compiler objects and its resulting ELF-binaries. - -This causes the CMake-internal detection of the mangling scheme for the -naming of subroutines to fail. Thus we must ensure to have any link-time -optimization features to be disabled on the executable file we perform the -detection on. - -The static libraries, however, must be build with LTO and non-LTO objects, -as that will ensure the verify step will operate on IPO objects, if building -those is requested by the system compiler flags. - -Fixes: #23123 - -Signed-off-by: Björn Esser ---- - Modules/FortranCInterface/CMakeLists.txt | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/Modules/FortranCInterface/CMakeLists.txt b/Modules/FortranCInterface/CMakeLists.txt -index 13e4498ad9..ce0bc10c8e 100644 ---- a/Modules/FortranCInterface/CMakeLists.txt -+++ b/Modules/FortranCInterface/CMakeLists.txt -@@ -102,6 +102,19 @@ set_property(TARGET symbols PROPERTY POSITION_INDEPENDENT_CODE 1) - add_executable(FortranCInterface main.F call_sub.f ${call_mod}) - target_link_libraries(FortranCInterface PUBLIC symbols) - -+# If IPO is enabled here, GCC gfortran >= 12.0 will obfuscate -+# the strings of the return values in the compiled executable, -+# which we use to regex match against later. -+# The static libraries must be build with IPO and non-IPO objects, -+# as that will ensure the verify step will operate on IPO objects, -+# if requested by the system compiler flags. -+if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU" AND -+ CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 12) -+ target_compile_options(FortranCInterface PRIVATE "-fno-lto") -+ target_compile_options(myfort PRIVATE "-flto=auto" "-ffat-lto-objects") -+ target_compile_options(symbols PRIVATE "-flto=auto" "-ffat-lto-objects") -+endif() -+ - file(GENERATE OUTPUT exe-$.cmake CONTENT [[ - set(FortranCInterface_EXE "$") - ]]) --- -2.34.1 - diff --git a/cmake.spec b/cmake.spec index e822b3d..42986e4 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,14 +68,14 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 7 +%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}.1 +Version: %{major_version}.%{minor_version}.2 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -109,25 +109,6 @@ Patch101: %{name}-fedora-flag_release.patch # Add dl to CMAKE_DL_LIBS on MINGW # https://gitlab.kitware.com/cmake/cmake/issues/17600 Patch102: %{name}-mingw-dl.patch -# Add support for Python 3.11 (merged in upstream) -# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6792 -Patch103: 0003-Add-support-for-Python-3.11.patch -# Add support for Boost 1.78 (merged in upstream) -# https://gitlab.kitware.com/cmake/cmake/-/issues/23016 -Patch104: 0004-FindBoost-Add-support-for-Boost-1.78.patch -# FindBoost: Add support for Python >= 3.10 (merged in upstream) -# https://gitlab.kitware.com/cmake/cmake/-/issues/23025 -Patch105: 0005-FindBoost-Add-support-for-Python-3.10.patch -# FindBoost: Do not warn about now-supported version 1.78 (merged in upstream) -# https://gitlab.kitware.com/cmake/cmake/-/issues/23016 -Patch106: 0006-FindBoost-Do-not-warn-about-now-supported-version-1..patch -# FindGLUT: Provide legacy GLUT_INCLUDE_DIR result in pkg-config code path (merged in upstream) -# https://gitlab.kitware.com/cmake/cmake/-/issues/23018 -Patch107: 0007-FindGLUT-Provide-legacy-GLUT_INCLUDE_DIR-result-in-p.patch -# FortranCInterface: Fix compatibility with GCC gfortran 12 LTO (proposed PR upstream) -# https://bugzilla.redhat.com/show_bug.cgi?id=2041904 -# https://gitlab.kitware.com/cmake/cmake/-/issues/23123 -Patch108: 0008-FortranCInterface-Fix-compatibility-with-GCC-gfortra.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -548,6 +529,10 @@ popd %changelog +* Tue Jan 25 2022 Björn Esser - 3.22.2-1 +- cmake-3.22.2 + Fixes rhbz#2045074 + * Thu Jan 20 2022 Björn Esser - 3.22.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 7479ea6..48fcf1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.22.1.tar.gz) = b1e900fe573cd1cc76d26386f2298d7722737c9ff67930ee108994972b4561ef69caeb537177c9b95b7f17b755e20e034825d3807ea0d2dd4c391310b03adc11 +SHA512 (cmake-3.22.2.tar.gz) = 86e95f9ce773bcc7513a1c3901561a1b09d06830936b8b1d44e075fe3bac55cfa636eccdedfa94a9939f5e12eb965224559fac30a17c64314ee023acb2a3e53f From a299111fe199471d86ed9067aee3ba452c4e9d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 23 Feb 2022 17:49:58 +0100 Subject: [PATCH 101/238] cmake-3.23.0-rc2 Fixes rhbz#2052100 --- cmake-findruby.patch | 8 ++++---- cmake-mingw-dl.patch | 6 +++--- cmake.spec | 12 ++++++++---- sources | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/cmake-findruby.patch b/cmake-findruby.patch index 23966a2..72a8b25 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,8 +1,8 @@ -Index: cmake-3.22.0-rc1/Modules/FindRuby.cmake +Index: cmake-3.23.0-rc2/Modules/FindRuby.cmake =================================================================== ---- 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_ +--- 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_ _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR) diff --git a/cmake-mingw-dl.patch b/cmake-mingw-dl.patch index 8b0135e..9934788 100644 --- a/cmake-mingw-dl.patch +++ b/cmake-mingw-dl.patch @@ -1,7 +1,7 @@ -Index: cmake-3.22.0-rc1/Modules/Platform/Windows-GNU.cmake +Index: cmake-3.23.0-rc2/Modules/Platform/Windows-GNU.cmake =================================================================== ---- cmake-3.22.0-rc1.orig/Modules/Platform/Windows-GNU.cmake -+++ cmake-3.22.0-rc1/Modules/Platform/Windows-GNU.cmake +--- cmake-3.23.0-rc2.orig/Modules/Platform/Windows-GNU.cmake ++++ cmake-3.23.0-rc2/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 diff --git a/cmake.spec b/cmake.spec index 42986e4..634b63e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -61,21 +61,21 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 22 +%global minor_version 23 # Set to RC version if building RC, else %%{nil} -#global rcsuf %%{nil} +%global rcsuf rc2 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 0.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 +Version: %{major_version}.%{minor_version}.0 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -529,6 +529,10 @@ popd %changelog +* Wed Feb 23 2022 Björn Esser - 3.23.0-0.1.rc2 +- cmake-3.23.0-rc2 + Fixes rhbz#2052100 + * Tue Jan 25 2022 Björn Esser - 3.22.2-1 - cmake-3.22.2 Fixes rhbz#2045074 diff --git a/sources b/sources index 48fcf1f..926ee6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.22.2.tar.gz) = 86e95f9ce773bcc7513a1c3901561a1b09d06830936b8b1d44e075fe3bac55cfa636eccdedfa94a9939f5e12eb965224559fac30a17c64314ee023acb2a3e53f +SHA512 (cmake-3.23.0-rc2.tar.gz) = 12e11dc66a4f79faacb2f6ac503adda5b349b68c7d9b9d7824651cf77dd49b65d58fa5ff23e6e3c38e03ef60a2f34139a663261725cacec603db37cd42fae0da From 3249491fb3ee479ce3e89a87c9b895de71fbf209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 23 Feb 2022 18:10:18 +0100 Subject: [PATCH 102/238] Exclude BundleUtilities from testsuite --- cmake.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 634b63e..ce6f8c4 100644 --- a/cmake.spec +++ b/cmake.spec @@ -443,9 +443,9 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \ %if %{with test} %check pushd %{_vpath_builddir} -# CTestTestUpload require internet access +# CTestTestUpload and BundleUtilities require internet access # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983 -NO_TEST="CTestTestUpload" +NO_TEST="CTestTestUpload|BundleUtilities" # Likely failing for GCC 12 NO_TEST="$NO_TEST|CustomCommand|CMakeLib.testCTestResourceAllocator" NO_TEST="$NO_TEST|CMakeLib.testCTestResourceSpec|RunCMake.PositionIndependentCode" From 449b8c6bb1849c6e3dcd4f9c59e9830f96767b7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:10:54 +0000 Subject: [PATCH 103/238] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index ce6f8c4..ad42822 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 0.1 +%global baserelease 0.2 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -529,6 +529,9 @@ popd %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 3.23.0-0.2.rc2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Feb 23 2022 Björn Esser - 3.23.0-0.1.rc2 - cmake-3.23.0-rc2 Fixes rhbz#2052100 From c87b6228ec280c754cee41b7aa809717bb2fd05d Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 29 Jul 2022 17:30:45 +0100 Subject: [PATCH 104/238] Update to 3.23.3 --- cmake.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index ad42822..347b015 100644 --- a/cmake.spec +++ b/cmake.spec @@ -63,19 +63,19 @@ %global major_version 3 %global minor_version 23 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc2 +#global rcsuf %%{nil} %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 0.2 +%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}.0 +Version: %{major_version}.%{minor_version}.3 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -529,6 +529,9 @@ popd %changelog +* Fri Jul 29 2022 Leigh Scott - 3.23.3-1 +- cmake-3.23.3 + * Wed Jul 20 2022 Fedora Release Engineering - 3.23.0-0.2.rc2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 926ee6c..c37efbb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.23.0-rc2.tar.gz) = 12e11dc66a4f79faacb2f6ac503adda5b349b68c7d9b9d7824651cf77dd49b65d58fa5ff23e6e3c38e03ef60a2f34139a663261725cacec603db37cd42fae0da +SHA512 (cmake-3.23.3.tar.gz) = 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632 From c18e747be3281e8c8bf696a7d9590b80e388e46b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 29 Jul 2022 13:30:56 -0500 Subject: [PATCH 105/238] fixup changelog dates --- cmake.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 347b015..8dacefe 100644 --- a/cmake.spec +++ b/cmake.spec @@ -678,16 +678,16 @@ popd * Tue Dec 15 2020 Tom Stellard - 3.18.4-4 - Update BuildRequires for eln -* Fri Nov 20 08:32:34 EST 2020 Neal Gompa - 3.18.4-3 +* Fri Nov 20 2020 Neal Gompa - 3.18.4-3 - Ensure CMake does not strip binaries with package builds * Mon Nov 09 2020 Miro Hrončok - 3.18.4-2 - Add support for Python 3.10 -* Tue Oct 13 10:03:16 CEST 2020 Björn Esser - 3.18.4-1 +* Tue Oct 13 2020 Björn Esser - 3.18.4-1 - Update to 3.18.4 -* Wed Sep 30 12:49:57 CEST 2020 Björn Esser - 3.18.3-1 +* Wed Sep 30 2020 Björn Esser - 3.18.3-1 - Update to 3.18.3 - Explicitly require make - Add patch to support FlexiBLAS From 08e6d37afb8fefbaa761c29eaffba8e13d260b00 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 5 Aug 2022 13:02:02 +0100 Subject: [PATCH 106/238] Update to 3.24.0 --- cmake.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 8dacefe..7accea5 100644 --- a/cmake.spec +++ b/cmake.spec @@ -61,7 +61,7 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 23 +%global minor_version 24 # Set to RC version if building RC, else %%{nil} #global rcsuf %%{nil} %{?rcsuf:%global relsuf .%{rcsuf}} @@ -75,7 +75,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.3 +Version: %{major_version}.%{minor_version}.0 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -529,6 +529,9 @@ popd %changelog +* Fri Aug 05 2022 Leigh Scott - 3.24.0-1 +- cmake-3.24.0 + * Fri Jul 29 2022 Leigh Scott - 3.23.3-1 - cmake-3.23.3 diff --git a/sources b/sources index c37efbb..0aea30d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.23.3.tar.gz) = 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632 +SHA512 (cmake-3.24.0.tar.gz) = 91507fc0643f2de20e37cd8d6a539d8cb38a80b604bf77de8e88c8446b6d7b6d02b7329d58966dc2412c6c75edcb9dfbdae02fe84965fefeb7ca47f87631fe17 From 7cf46b9e778b26a2510b5014dd856c502861b4a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 18 Aug 2022 09:45:05 +0200 Subject: [PATCH 107/238] Update to 3.24.1 --- cmake.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 7accea5..6f6c469 100644 --- a/cmake.spec +++ b/cmake.spec @@ -75,7 +75,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.0 +Version: %{major_version}.%{minor_version}.1 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -529,6 +529,9 @@ popd %changelog +* Thu Aug 18 2022 Björn Esser - 3.24.1-1 +- cmake-3.24.1 + * Fri Aug 05 2022 Leigh Scott - 3.24.0-1 - cmake-3.24.0 diff --git a/sources b/sources index 0aea30d..67992de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.24.0.tar.gz) = 91507fc0643f2de20e37cd8d6a539d8cb38a80b604bf77de8e88c8446b6d7b6d02b7329d58966dc2412c6c75edcb9dfbdae02fe84965fefeb7ca47f87631fe17 +SHA512 (cmake-3.24.1.tar.gz) = 67bfafcf9ceba617d7ebbb0ac88b689a2d90ab51fea4a83bd073ee082fb55de8962ce7fb283f3db5f455d286f2199843ffa595a1de207d4fa3e4472d951eb289 From 01a89ac7b247265e26541241007c3ef074cecfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 29 Oct 2022 11:57:54 +0200 Subject: [PATCH 108/238] Update to 3.24.2 --- cmake.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 6f6c469..9781a8f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -75,7 +75,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.1 +Version: %{major_version}.%{minor_version}.2 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -529,6 +529,9 @@ popd %changelog +* Sat Oct 29 2022 Björn Esser - 3.24.2-1 +- cmake-3.24.2 + * Thu Aug 18 2022 Björn Esser - 3.24.1-1 - cmake-3.24.1 diff --git a/sources b/sources index 67992de..650f1f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.24.1.tar.gz) = 67bfafcf9ceba617d7ebbb0ac88b689a2d90ab51fea4a83bd073ee082fb55de8962ce7fb283f3db5f455d286f2199843ffa595a1de207d4fa3e4472d951eb289 +SHA512 (cmake-3.24.2.tar.gz) = 6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674 From 7df9be99dc7f57cae228fe8e00a9320f91c0f4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 29 Oct 2022 17:50:24 +0200 Subject: [PATCH 109/238] Exclude ExternalProject and CTest.UpdateGIT from testsuite --- cmake.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 9781a8f..a8518e5 100644 --- a/cmake.spec +++ b/cmake.spec @@ -443,9 +443,9 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \ %if %{with test} %check pushd %{_vpath_builddir} -# CTestTestUpload and BundleUtilities require internet access +# CTestTestUpload, BundleUtilities, ExternalProject, and CTest.UpdateGIT require internet access # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983 -NO_TEST="CTestTestUpload|BundleUtilities" +NO_TEST="CTestTestUpload|BundleUtilities|ExternalProject|CTest.UpdateGIT" # Likely failing for GCC 12 NO_TEST="$NO_TEST|CustomCommand|CMakeLib.testCTestResourceAllocator" NO_TEST="$NO_TEST|CMakeLib.testCTestResourceSpec|RunCMake.PositionIndependentCode" From a538e8d057944c9ac1792e18dfd351f3c08ef2b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 29 Oct 2022 12:03:59 +0200 Subject: [PATCH 110/238] cmake-3.25.0-rc2 Fixes rhbz#2062783 --- cmake.spec | 12 ++++++++---- sources | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cmake.spec b/cmake.spec index a8518e5..60bc5c3 100644 --- a/cmake.spec +++ b/cmake.spec @@ -61,21 +61,21 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 24 +%global minor_version 25 # Set to RC version if building RC, else %%{nil} -#global rcsuf %%{nil} +%global rcsuf rc2 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 0.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 +Version: %{major_version}.%{minor_version}.0 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -529,6 +529,10 @@ popd %changelog +* Sat Oct 29 2022 Björn Esser - 3.25.0-0.1.rc2 +- cmake-3.25.0-rc2 + Fixes rhbz#2062783 + * Sat Oct 29 2022 Björn Esser - 3.24.2-1 - cmake-3.24.2 diff --git a/sources b/sources index 650f1f0..3e604b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.24.2.tar.gz) = 6f0e8e29bf0336f555ba72c4d83f35d820f8a5159cc999d48795dc57a6627b4ee3966dda84ca97d39906e35dd476ea00cf80023672cc0fad862e2996194c0674 +SHA512 (cmake-3.25.0-rc2.tar.gz) = 74d2f67d0653b0ca658b8b10556e575421f36ab10d4a233b6602a482871478af7322171df4a989b1393872e24edccc18e658ac31d78372ff2ef8da7ac6664dd4 From 59c57b9caae3ceca514772cd3145c25ec8532093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 30 Oct 2022 13:09:50 +0100 Subject: [PATCH 111/238] Drop non-upstream CMAKE_DL_LIBS windows patch Fixes rhbz#2127529 --- cmake.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 60bc5c3..e5cdf9a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 0.1 +%global baserelease 0.2 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -108,7 +108,9 @@ Patch101: %{name}-fedora-flag_release.patch %endif # Add dl to CMAKE_DL_LIBS on MINGW # https://gitlab.kitware.com/cmake/cmake/issues/17600 +%if 0%{?fedora} && 0%{?fedora} < 38 Patch102: %{name}-mingw-dl.patch +%endif # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -529,6 +531,10 @@ popd %changelog +* Sun Oct 30 2022 Björn Esser - 3.25.0-0.2.rc2 +- Drop non-upstream CMAKE_DL_LIBS windows patch + Fixes rhbz#2127529 + * Sat Oct 29 2022 Björn Esser - 3.25.0-0.1.rc2 - cmake-3.25.0-rc2 Fixes rhbz#2062783 From 198fb99c989b7ff62ce3320610989143fba65b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 30 Oct 2022 13:56:05 +0100 Subject: [PATCH 112/238] Allow valid short arguments for %%ctest macro Fixes rhbz#2127650 --- cmake.spec | 6 +++++- macros.cmake | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index e5cdf9a..750255a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 0.2 +%global baserelease 0.3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -531,6 +531,10 @@ popd %changelog +* Sun Oct 30 2022 Björn Esser - 3.25.0-0.3.rc2 +- Allow valid short arguments for %%ctest macro + Fixes rhbz#2127650 + * Sun Oct 30 2022 Björn Esser - 3.25.0-0.2.rc2 - Drop non-upstream CMAKE_DL_LIBS windows patch Fixes rhbz#2127529 diff --git a/macros.cmake b/macros.cmake index 54598ee..257f0bd 100644 --- a/macros.cmake +++ b/macros.cmake @@ -50,7 +50,7 @@ %cmake_install \ DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}" -%ctest(:-:) \ +%ctest(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \ cd "%{__cmake_builddir}" \ %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \ cd - @@ -59,4 +59,5 @@ %cmake@@CMAKE_MAJOR_VERSION@@ %cmake %cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build %cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install -%ctest@@CMAKE_MAJOR_VERSION@@(:-:) %ctest %{**} +%ctest@@CMAKE_MAJOR_VERSION@@(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \ + %ctest %{**} From c0e29fc6cb49bc7716d1ecfb2fa8bab97221d846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 2 Nov 2022 07:54:11 +0100 Subject: [PATCH 113/238] cmake-3.25.0-rc3 Fixes rhbz#2062783 --- cmake.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 750255a..b1ea0b6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -63,12 +63,12 @@ %global major_version 3 %global minor_version 25 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc2 +%global rcsuf rc3 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 0.3 +%global baserelease 0.4 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -531,6 +531,10 @@ popd %changelog +* Wed Nov 02 2022 Björn Esser - 3.25.0-0.4.rc3 +- cmake-3.25.0-rc3 + Fixes rhbz#2062783 + * Sun Oct 30 2022 Björn Esser - 3.25.0-0.3.rc2 - Allow valid short arguments for %%ctest macro Fixes rhbz#2127650 diff --git a/sources b/sources index 3e604b9..5dd005c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.25.0-rc2.tar.gz) = 74d2f67d0653b0ca658b8b10556e575421f36ab10d4a233b6602a482871478af7322171df4a989b1393872e24edccc18e658ac31d78372ff2ef8da7ac6664dd4 +SHA512 (cmake-3.25.0-rc3.tar.gz) = f0a99cf5f52d0dff64000ec2553126830e31d3a5b8015285f48f362d8e2ec40cc99b7cea1518c04644b3f5728b674dc64642859b73b5f2e2b85f05f15cf4e56d From aa5cce21c6fbdacbad31afc90c3d42b9b3f3af66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 2 Nov 2022 08:19:42 +0100 Subject: [PATCH 114/238] Re-enable ExternalProject and CTest.UpdateGIT on testsuite run This reverts commit 7df9be99dc7f57cae228fe8e00a9320f91c0f4e7. --- cmake.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index b1ea0b6..4dee600 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 0.4 +%global baserelease 0.5 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -445,9 +445,9 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \ %if %{with test} %check pushd %{_vpath_builddir} -# CTestTestUpload, BundleUtilities, ExternalProject, and CTest.UpdateGIT require internet access +# CTestTestUpload and BundleUtilities require internet access # CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983 -NO_TEST="CTestTestUpload|BundleUtilities|ExternalProject|CTest.UpdateGIT" +NO_TEST="CTestTestUpload|BundleUtilities" # Likely failing for GCC 12 NO_TEST="$NO_TEST|CustomCommand|CMakeLib.testCTestResourceAllocator" NO_TEST="$NO_TEST|CMakeLib.testCTestResourceSpec|RunCMake.PositionIndependentCode" @@ -531,6 +531,9 @@ popd %changelog +* Wed Nov 02 2022 Björn Esser - 3.25.0-0.5.rc3 +- Re-enable ExternalProject and CTest.UpdateGIT on testsuite run + * Wed Nov 02 2022 Björn Esser - 3.25.0-0.4.rc3 - cmake-3.25.0-rc3 Fixes rhbz#2062783 From e609e81f2792409797bb0592fad302a8ad8787ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 2 Nov 2022 09:34:44 +0100 Subject: [PATCH 115/238] Re-enable some more tests that are passing now --- cmake.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake.spec b/cmake.spec index 4dee600..752d34c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -445,12 +445,10 @@ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \ %if %{with test} %check pushd %{_vpath_builddir} -# CTestTestUpload and BundleUtilities require internet access -# CPackComponentsForAll-RPM-IgnoreGroup failing wih rpm 4.15 - https://gitlab.kitware.com/cmake/cmake/issues/19983 -NO_TEST="CTestTestUpload|BundleUtilities" -# Likely failing for GCC 12 -NO_TEST="$NO_TEST|CustomCommand|CMakeLib.testCTestResourceAllocator" -NO_TEST="$NO_TEST|CMakeLib.testCTestResourceSpec|RunCMake.PositionIndependentCode" +# CTestTestUpload requires internet access. +NO_TEST="CTestTestUpload" +# Likely failing for hardening flags from system. +NO_TEST="$NO_TEST|CustomCommand|RunCMake.PositionIndependentCode" # kwsys.testProcess-{4,5} are flaky on s390x. %ifarch s390x NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" @@ -460,7 +458,7 @@ NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" NO_TEST="$NO_TEST|curl" %endif bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure -## do this only periodically, not for every build -- rdieter 20210429 +## do this only periodically, not for every build -- besser82 20221102 # Keep an eye on failing tests #bin/ctest%{?name_suffix} %{?_smp_mflags} -V -R "$NO_TEST" --output-on-failure || : popd @@ -532,7 +530,9 @@ popd %changelog * Wed Nov 02 2022 Björn Esser - 3.25.0-0.5.rc3 -- Re-enable ExternalProject and CTest.UpdateGIT on testsuite run +- Re-enable BundleUtilities, CMakeLib.testCTestResourceAllocator, + CMakeLib.testCTestResourceSpec, CTest.UpdateGIT, ExternalProject + during testsuite run * Wed Nov 02 2022 Björn Esser - 3.25.0-0.4.rc3 - cmake-3.25.0-rc3 From b02a9d979e6524080710405e995d07d4fe8f457d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 2 Nov 2022 09:36:12 +0100 Subject: [PATCH 116/238] Re-enable kwsys.testProcess-{4,5} on s390x --- cmake.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index 752d34c..38c2080 100644 --- a/cmake.spec +++ b/cmake.spec @@ -449,10 +449,6 @@ pushd %{_vpath_builddir} NO_TEST="CTestTestUpload" # Likely failing for hardening flags from system. NO_TEST="$NO_TEST|CustomCommand|RunCMake.PositionIndependentCode" -# kwsys.testProcess-{4,5} are flaky on s390x. -%ifarch s390x -NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5" -%endif # curl test may fail during bootstrap %if %{with bootstrap} NO_TEST="$NO_TEST|curl" @@ -533,6 +529,7 @@ popd - Re-enable BundleUtilities, CMakeLib.testCTestResourceAllocator, CMakeLib.testCTestResourceSpec, CTest.UpdateGIT, ExternalProject during testsuite run +- Re-enable kwsys.testProcess-{4,5} on s390x * Wed Nov 02 2022 Björn Esser - 3.25.0-0.4.rc3 - cmake-3.25.0-rc3 From 098fd9fa1553d39eb19836640da2c6a60e08a45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 9 Nov 2022 08:07:16 +0100 Subject: [PATCH 117/238] cmake-3.25.0-rc4 Fixes rhbz#2141122 --- cmake.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 38c2080..404b1fb 100644 --- a/cmake.spec +++ b/cmake.spec @@ -63,12 +63,12 @@ %global major_version 3 %global minor_version 25 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc3 +%global rcsuf rc4 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 0.5 +%global baserelease 0.6 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -525,6 +525,10 @@ popd %changelog +* Wed Nov 09 2022 Björn Esser - 3.25.0-0.6.rc4 +- cmake-3.25.0-rc4 + Fixes rhbz#2141122 + * Wed Nov 02 2022 Björn Esser - 3.25.0-0.5.rc3 - Re-enable BundleUtilities, CMakeLib.testCTestResourceAllocator, CMakeLib.testCTestResourceSpec, CTest.UpdateGIT, ExternalProject diff --git a/sources b/sources index 5dd005c..76b072e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.25.0-rc3.tar.gz) = f0a99cf5f52d0dff64000ec2553126830e31d3a5b8015285f48f362d8e2ec40cc99b7cea1518c04644b3f5728b674dc64642859b73b5f2e2b85f05f15cf4e56d +SHA512 (cmake-3.25.0-rc4.tar.gz) = d2ecec5e35ebd184d685848ce14770d71ef6836993d73cd8156c6276c82cb51a54e5dd9ba7eee592ea22d05df4dd5c83c311e72963e5fc27eb972fa9b63a51a9 From dbe4a674efd94277d26b27a8f0c591d0e50d69d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 16 Nov 2022 22:03:14 +0100 Subject: [PATCH 118/238] cmake-3.25.0 Fixes rhbz#2143345 --- cmake.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 404b1fb..9daab9c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -63,12 +63,12 @@ %global major_version 3 %global minor_version 25 # Set to RC version if building RC, else %%{nil} -%global rcsuf rc4 +#global rcsuf rc1 %{?rcsuf:%global relsuf .%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 0.6 +%global baserelease 1 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -525,6 +525,10 @@ popd %changelog +* Wed Nov 16 2022 Björn Esser - 3.25.0-1 +- cmake-3.25.0 + Fixes rhbz#2143345 + * Wed Nov 09 2022 Björn Esser - 3.25.0-0.6.rc4 - cmake-3.25.0-rc4 Fixes rhbz#2141122 diff --git a/sources b/sources index 76b072e..f335010 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.25.0-rc4.tar.gz) = d2ecec5e35ebd184d685848ce14770d71ef6836993d73cd8156c6276c82cb51a54e5dd9ba7eee592ea22d05df4dd5c83c311e72963e5fc27eb972fa9b63a51a9 +SHA512 (cmake-3.25.0.tar.gz) = f6e527161b8501c72b71a95ff7a0cf304ae02a214086ff58dd686543243d939e83faf94780cda477b19e4d42e4b8f1ff96c52f98e8f7f717e102a5229f4dd44c From 697509ac7dffb8173394a6f15bfde52ae90340fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 5 Dec 2022 06:15:59 +0100 Subject: [PATCH 119/238] cmake-3.25.1 Fixes rhbz#2149681 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 9daab9c..ee7c5fa 100644 --- a/cmake.spec +++ b/cmake.spec @@ -75,7 +75,7 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.0 +Version: %{major_version}.%{minor_version}.1 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -525,6 +525,10 @@ popd %changelog +* Mon Dec 05 2022 Björn Esser - 3.25.1-1 +- cmake-3.25.1 + Fixes rhbz#2149681 + * Wed Nov 16 2022 Björn Esser - 3.25.0-1 - cmake-3.25.0 Fixes rhbz#2143345 diff --git a/sources b/sources index f335010..b899eb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.25.0.tar.gz) = f6e527161b8501c72b71a95ff7a0cf304ae02a214086ff58dd686543243d939e83faf94780cda477b19e4d42e4b8f1ff96c52f98e8f7f717e102a5229f4dd44c +SHA512 (cmake-3.25.1.tar.gz) = ec4203cac569e3c340bf6535d193d9ccff9c4e4d59a7a7ae5b9156172f647d9f9212bdc37b3c12cbd676b1351b9a64364c563aaa968a2f41e0f402410ed78d57 From 77b93ad1b920705814fa0d553b3b7cc49565b656 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 13 Jan 2023 05:01:20 -0500 Subject: [PATCH 120/238] Adjust ctest macro to use native out-of-tree support With CMake 3.20, ctest(1) learned how to be told where the generated working directory is, so we no longer have to change directories (and thus, rely on shell semantics to get back out of that directory) to make CTest work properly. This change tweaks the %ctest macro such that we are leveraging that new option and eliminates our usage of cd(1) as a workaround. --- cmake.spec | 5 ++++- macros.cmake | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index ee7c5fa..7886a6b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,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} @@ -525,6 +525,9 @@ popd %changelog +* Fri Jan 13 2023 Neal Gompa - 3.25.1-2 +- Adjust ctest macro to use native out-of-tree support + * Mon Dec 05 2022 Björn Esser - 3.25.1-1 - cmake-3.25.1 Fixes rhbz#2149681 diff --git a/macros.cmake b/macros.cmake index 257f0bd..63860a0 100644 --- a/macros.cmake +++ b/macros.cmake @@ -51,9 +51,7 @@ DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}" %ctest(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \ - cd "%{__cmake_builddir}" \ - %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} \ - cd - + %__ctest --test-dir "%{__cmake_builddir}" --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} %cmake@@CMAKE_MAJOR_VERSION@@ %cmake From e813f8279b23503a59913565cea4c6301459064c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 15 Jan 2023 13:00:03 +0100 Subject: [PATCH 121/238] Small indentation fix --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 7886a6b..4a6cea5 100644 --- a/cmake.spec +++ b/cmake.spec @@ -114,7 +114,7 @@ Patch102: %{name}-mingw-dl.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} -Patch1: %{name}-rename.patch +Patch1: %{name}-rename.patch %endif BuildRequires: coreutils From 6f2559e4aec2895709664676437577365831d9ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 15 Jan 2023 13:05:09 +0100 Subject: [PATCH 122/238] Backport upstream patch for Boost v1.81 support --- cmake-3.25.1-Boost_181.patch | 52 ++++++++++++++++++++++++++++++++++++ cmake.spec | 9 ++++++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 cmake-3.25.1-Boost_181.patch diff --git a/cmake-3.25.1-Boost_181.patch b/cmake-3.25.1-Boost_181.patch new file mode 100644 index 0000000..48d4a9d --- /dev/null +++ b/cmake-3.25.1-Boost_181.patch @@ -0,0 +1,52 @@ +From a97032c4e7b1efb4c5535e5f705ef8ffd5fc2dd3 Mon Sep 17 00:00:00 2001 +From: leha-bot +Date: Tue, 27 Dec 2022 18:25:38 +0300 +Subject: [PATCH] FindBoost: Add Boost 1.81 support + +Update the list of known versions. + +There is a new header-only library, Boost.URL. It has no +dependencies and has a core header ``. + +Run the command + + cmake -DBOOST_DIR=/path/to/boost_1_81_0 \ + -P Utilities/Scripts/BoostScanDeps.cmake + +to extract dependencies from the 1.81.0 source tree. +They are the same as 1.80's dependencies, so just update +the version check for warning about newer versions. +--- + Modules/FindBoost.cmake | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake +index 0cea239ac95..72a9a4c1923 100644 +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -1380,7 +1380,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + set(_Boost_TIMER_DEPENDENCIES chrono) + set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) +- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.81.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) ++ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.82.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) + message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") + endif() + endif() +@@ -1466,6 +1466,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs) + set(_Boost_TIMER_HEADERS "boost/timer.hpp") + set(_Boost_TYPE_ERASURE_HEADERS "boost/type_erasure/config.hpp") + set(_Boost_UNIT_TEST_FRAMEWORK_HEADERS "boost/test/framework.hpp") ++ set(_Boost_URL_HEADERS "boost/url.hpp") + set(_Boost_WAVE_HEADERS "boost/wave.hpp") + set(_Boost_WSERIALIZATION_HEADERS "boost/archive/text_wiarchive.hpp") + set(_Boost_BZIP2_HEADERS "boost/iostreams/filter/bzip2.hpp") +@@ -1653,7 +1654,7 @@ else() + # _Boost_COMPONENT_HEADERS. See the instructions at the top of + # _Boost_COMPONENT_DEPENDENCIES. + set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} +- "1.80.0" "1.80" "1.79.0" "1.79" ++ "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79" + "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" + "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" + "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" diff --git a/cmake.spec b/cmake.spec index 4a6cea5..fa9da66 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -112,6 +112,10 @@ Patch101: %{name}-fedora-flag_release.patch Patch102: %{name}-mingw-dl.patch %endif +# FindBoost: Add Boost 1.81 support. +# https://github.com/Kitware/CMake/commit/a97032c4e7b1efb4c5535e5f705ef8ffd5fc2dd3 +Patch200: https://github.com/Kitware/CMake/commit/a97032c4e7b1efb4c5535e5f705ef8ffd5fc2dd3.patch#/%{name}-3.25.1-Boost_181.patch + # Patch for renaming on EPEL %if 0%{?name_suffix:1} Patch1: %{name}-rename.patch @@ -525,6 +529,9 @@ popd %changelog +* Sun Jan 15 2023 Björn Esser - 3.25.1-3 +- Backport upstream patch for Boost v1.81 support + * Fri Jan 13 2023 Neal Gompa - 3.25.1-2 - Adjust ctest macro to use native out-of-tree support From 069fdb1d8ca75f37dd6639f56e3d5d9d35eca2b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:06:30 +0000 Subject: [PATCH 123/238] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index fa9da66..36b43c7 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,7 +68,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -529,6 +529,9 @@ popd %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.25.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Jan 15 2023 Björn Esser - 3.25.1-3 - Backport upstream patch for Boost v1.81 support From 20cb796f3f2f118579ee5a7fd343d9e1ce09a230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 19 Jan 2023 19:58:25 +0100 Subject: [PATCH 124/238] cmake-3.25.2 Fixes rhbz#2162459 --- cmake-3.25.1-Boost_181.patch | 52 ------------------------------------ cmake.spec | 12 ++++----- sources | 2 +- 3 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 cmake-3.25.1-Boost_181.patch diff --git a/cmake-3.25.1-Boost_181.patch b/cmake-3.25.1-Boost_181.patch deleted file mode 100644 index 48d4a9d..0000000 --- a/cmake-3.25.1-Boost_181.patch +++ /dev/null @@ -1,52 +0,0 @@ -From a97032c4e7b1efb4c5535e5f705ef8ffd5fc2dd3 Mon Sep 17 00:00:00 2001 -From: leha-bot -Date: Tue, 27 Dec 2022 18:25:38 +0300 -Subject: [PATCH] FindBoost: Add Boost 1.81 support - -Update the list of known versions. - -There is a new header-only library, Boost.URL. It has no -dependencies and has a core header ``. - -Run the command - - cmake -DBOOST_DIR=/path/to/boost_1_81_0 \ - -P Utilities/Scripts/BoostScanDeps.cmake - -to extract dependencies from the 1.81.0 source tree. -They are the same as 1.80's dependencies, so just update -the version check for warning about newer versions. ---- - Modules/FindBoost.cmake | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index 0cea239ac95..72a9a4c1923 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -1380,7 +1380,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - set(_Boost_TIMER_DEPENDENCIES chrono) - set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) - set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) -- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.81.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) -+ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.82.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) - message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") - endif() - endif() -@@ -1466,6 +1466,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs) - set(_Boost_TIMER_HEADERS "boost/timer.hpp") - set(_Boost_TYPE_ERASURE_HEADERS "boost/type_erasure/config.hpp") - set(_Boost_UNIT_TEST_FRAMEWORK_HEADERS "boost/test/framework.hpp") -+ set(_Boost_URL_HEADERS "boost/url.hpp") - set(_Boost_WAVE_HEADERS "boost/wave.hpp") - set(_Boost_WSERIALIZATION_HEADERS "boost/archive/text_wiarchive.hpp") - set(_Boost_BZIP2_HEADERS "boost/iostreams/filter/bzip2.hpp") -@@ -1653,7 +1654,7 @@ else() - # _Boost_COMPONENT_HEADERS. See the instructions at the top of - # _Boost_COMPONENT_DEPENDENCIES. - set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} -- "1.80.0" "1.80" "1.79.0" "1.79" -+ "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79" - "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" - "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" - "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" diff --git a/cmake.spec b/cmake.spec index 36b43c7..8666925 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,14 +68,14 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 4 +%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}.1 +Version: %{major_version}.%{minor_version}.2 Release: %{baserelease}%{?relsuf}%{?dist} Summary: Cross-platform make system @@ -112,10 +112,6 @@ Patch101: %{name}-fedora-flag_release.patch Patch102: %{name}-mingw-dl.patch %endif -# FindBoost: Add Boost 1.81 support. -# https://github.com/Kitware/CMake/commit/a97032c4e7b1efb4c5535e5f705ef8ffd5fc2dd3 -Patch200: https://github.com/Kitware/CMake/commit/a97032c4e7b1efb4c5535e5f705ef8ffd5fc2dd3.patch#/%{name}-3.25.1-Boost_181.patch - # Patch for renaming on EPEL %if 0%{?name_suffix:1} Patch1: %{name}-rename.patch @@ -529,6 +525,10 @@ popd %changelog +* Thu Jan 19 2023 Björn Esser - 3.25.2-1 +- cmake-3.25.2 + Fixes rhbz#2162459 + * Thu Jan 19 2023 Fedora Release Engineering - 3.25.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index b899eb7..40fb656 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.25.1.tar.gz) = ec4203cac569e3c340bf6535d193d9ccff9c4e4d59a7a7ae5b9156172f647d9f9212bdc37b3c12cbd676b1351b9a64364c563aaa968a2f41e0f402410ed78d57 +SHA512 (cmake-3.25.2.tar.gz) = 20146d06a1722c36249192944a58e4780aad334d2bc5ce2a3d8c4f24656630c5b71ca0ae7ed53587e3d46f488bd773452fa60c3fc7045fe54db2dbc6ffd86390 From a758a406b90bb235b07aff72e55de42988215a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 19 Jan 2023 20:23:20 +0100 Subject: [PATCH 125/238] Purge patch for custom release flags in Fedora --- cmake-fedora-flag_release.patch | 116 -------------------------------- cmake.spec | 4 -- 2 files changed, 120 deletions(-) delete mode 100644 cmake-fedora-flag_release.patch diff --git a/cmake-fedora-flag_release.patch b/cmake-fedora-flag_release.patch deleted file mode 100644 index c473d5f..0000000 --- a/cmake-fedora-flag_release.patch +++ /dev/null @@ -1,116 +0,0 @@ -Index: cmake-3.22.0-rc1/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") - string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " ") --string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3") -+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2") - 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.22.0-rc1/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") - string(APPEND CMAKE_Fortran_FLAGS_MINSIZEREL_INIT " -Os") --string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3") -+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2") - string(APPEND CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") - set(CMAKE_Fortran_MODDIR_FLAG "-fmod=") - set(CMAKE_Fortran_VERBOSE_FLAG "-v") -Index: cmake-3.22.0-rc1/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") - string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG") -- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG") -+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG") - 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.22.0-rc1/Modules/Compiler/GNU-Fortran.cmake -=================================================================== ---- 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") --string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O3") -+string(APPEND CMAKE_Fortran_FLAGS_RELEASE_INIT " -O2") - - # No -isystem for Fortran because it will not find .mod files. - unset(CMAKE_INCLUDE_SYSTEM_FLAG_Fortran) -Index: cmake-3.22.0-rc1/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") - string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os") -- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3") -+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2") - string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g") - - set(CMAKE_${lang}_COMPILER_PREDEFINES_COMMAND "${CMAKE_${lang}_COMPILER}") -Index: cmake-3.22.0-rc1/Modules/Compiler/NVIDIA-CUDA.cmake -=================================================================== ---- 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") -- string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG") -+ string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O2 -DNDEBUG") - string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG") - string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") - endif() -Index: cmake-3.22.0-rc1/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") - string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os") -- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3") -+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2") - string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g -O2") - endmacro() -Index: cmake-3.22.0-rc1/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") - string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -O2 -s") -- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O3") -+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -fast -O2") - string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -gopt") - - if(CMAKE_HOST_WIN32) -Index: cmake-3.22.0-rc1/Modules/Platform/Windows-Clang.cmake -=================================================================== ---- 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}") -- string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG ${__ADDED_FLAGS}") -+ string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O2 -DNDEBUG ${__ADDED_FLAGS}") - 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.spec b/cmake.spec index 8666925..b1f9e20 100644 --- a/cmake.spec +++ b/cmake.spec @@ -102,10 +102,6 @@ Source5: %{name}.req # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch -# replace release flag -O3 with -O2 for fedora -%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 %if 0%{?fedora} && 0%{?fedora} < 38 From fc9266751291859d5318cd8c92ce0cc190b37df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 9 Feb 2023 23:37:20 +0100 Subject: [PATCH 126/238] cmake-3.26.0-rc2 Fixes rhbz#2167064 --- cmake.spec | 30 +++++++++++++++++++++--------- sources | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/cmake.spec b/cmake.spec index b1f9e20..1855303 100644 --- a/cmake.spec +++ b/cmake.spec @@ -61,11 +61,19 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 25 -# Set to RC version if building RC, else %%{nil} -#global rcsuf rc1 -%{?rcsuf:%global relsuf .%{rcsuf}} -%{?rcsuf:%global versuf -%{rcsuf}} +%global minor_version 26 +%global patch_version 0 + +# Set to RC version if building RC, else comment out. +%global rcsuf rc2 + +%if 0%{?rcsuf:1} +%global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} +%global tar_version %{major_version}.%{minor_version}.%{patch_version}-%{rcsuf} +%else +%global pkg_version %{major_version}.%{minor_version}.%{patch_version} +%global tar_version %{major_version}.%{minor_version}.%{patch_version} +%endif # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -75,8 +83,8 @@ %global orig_name cmake Name: %{orig_name}%{?name_suffix} -Version: %{major_version}.%{minor_version}.2 -Release: %{baserelease}%{?relsuf}%{?dist} +Version: %{pkg_version} +Release: %{baserelease}%{?dist} Summary: Cross-platform make system # most sources are BSD @@ -86,7 +94,7 @@ Summary: Cross-platform make system # exception granting redistribution under terms of your choice License: BSD and MIT and zlib URL: http://www.cmake.org -Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{orig_name}-%{version}%{?versuf}.tar.gz +Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{orig_name}-%{tar_version}.tar.gz Source1: %{name}-init.el Source2: macros.%{name} # See https://bugzilla.redhat.com/show_bug.cgi?id=1202899 @@ -272,7 +280,7 @@ This package contains common RPM macros for %{name}. %prep -%autosetup -n %{orig_name}-%{version}%{?versuf} -p 1 +%autosetup -n %{orig_name}-%{tar_version} -p 1 %if %{with rpm} %if %{with python3} @@ -521,6 +529,10 @@ popd %changelog +* Thu Feb 09 2023 Björn Esser - 3.26.0~rc2-1 +- cmake-3.26.0-rc2 + Fixes rhbz#2167064 + * Thu Jan 19 2023 Björn Esser - 3.25.2-1 - cmake-3.25.2 Fixes rhbz#2162459 diff --git a/sources b/sources index 40fb656..e434942 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.25.2.tar.gz) = 20146d06a1722c36249192944a58e4780aad334d2bc5ce2a3d8c4f24656630c5b71ca0ae7ed53587e3d46f488bd773452fa60c3fc7045fe54db2dbc6ffd86390 +SHA512 (cmake-3.26.0-rc2.tar.gz) = 9738914eb4e1502df576ec04bb673ba486dbfa78726cda1ff4b852de8d958f4226602dae0c3f2b49e4984e4b3ce12fe8a8c6797faed4828f4ef7f814d5115cbd From c6527535927b10b00bbfb69bc36039945ff00aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 15 Feb 2023 18:39:16 +0100 Subject: [PATCH 127/238] cmake-3.26.0-rc3 Fixes rhbz#2170100 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 1855303..57969a0 100644 --- a/cmake.spec +++ b/cmake.spec @@ -65,7 +65,7 @@ %global patch_version 0 # Set to RC version if building RC, else comment out. -%global rcsuf rc2 +%global rcsuf rc3 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -529,6 +529,10 @@ popd %changelog +* Wed Feb 15 2023 Björn Esser - 3.26.0~rc3-1 +- cmake-3.26.0-rc3 + Fixes rhbz#2170100 + * Thu Feb 09 2023 Björn Esser - 3.26.0~rc2-1 - cmake-3.26.0-rc2 Fixes rhbz#2167064 diff --git a/sources b/sources index e434942..34a05f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.26.0-rc2.tar.gz) = 9738914eb4e1502df576ec04bb673ba486dbfa78726cda1ff4b852de8d958f4226602dae0c3f2b49e4984e4b3ce12fe8a8c6797faed4828f4ef7f814d5115cbd +SHA512 (cmake-3.26.0-rc3.tar.gz) = 264a817eaebed6af6e98cb2e48e11574f535ef365edeb67b9687b7cdda629581ff5541f306dea31736ae48636082a6afdc1ab1ea23c901143a4f03e7f342233e From 2c60d9d74ce4f11612c946129bc72d2e59718c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 22 Feb 2023 18:22:11 +0100 Subject: [PATCH 128/238] cmake-3.26.0-rc4 Fixes rhbz#2172604 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 57969a0..962c109 100644 --- a/cmake.spec +++ b/cmake.spec @@ -65,7 +65,7 @@ %global patch_version 0 # Set to RC version if building RC, else comment out. -%global rcsuf rc3 +%global rcsuf rc4 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -529,6 +529,10 @@ popd %changelog +* Wed Feb 22 2023 Björn Esser - 3.26.0~rc4-1 +- cmake-3.26.0-rc4 + Fixes rhbz#2172604 + * Wed Feb 15 2023 Björn Esser - 3.26.0~rc3-1 - cmake-3.26.0-rc3 Fixes rhbz#2170100 diff --git a/sources b/sources index 34a05f2..e81e0b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.26.0-rc3.tar.gz) = 264a817eaebed6af6e98cb2e48e11574f535ef365edeb67b9687b7cdda629581ff5541f306dea31736ae48636082a6afdc1ab1ea23c901143a4f03e7f342233e +SHA512 (cmake-3.26.0-rc4.tar.gz) = 647c44833eaffb65400a1909fe29d502c633c76e0be6245bea57e337d2a81d04b0c5fd00ad556c668469bc5391e896679369c979fe3abe8e09fc2090986595a7 From 9de9f679ec2eb50f89d34c1f3f446d4cf3f49d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 1 Mar 2023 17:59:40 +0100 Subject: [PATCH 129/238] cmake-3.26.0-rc5 --- cmake.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 962c109..e57baa9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -65,7 +65,7 @@ %global patch_version 0 # Set to RC version if building RC, else comment out. -%global rcsuf rc4 +%global rcsuf rc5 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -529,6 +529,9 @@ popd %changelog +* Wed Mar 01 2023 Björn Esser - 3.26.0~rc5-1 +- cmake-3.26.0-rc5 + * Wed Feb 22 2023 Björn Esser - 3.26.0~rc4-1 - cmake-3.26.0-rc4 Fixes rhbz#2172604 diff --git a/sources b/sources index e81e0b9..267fd3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.26.0-rc4.tar.gz) = 647c44833eaffb65400a1909fe29d502c633c76e0be6245bea57e337d2a81d04b0c5fd00ad556c668469bc5391e896679369c979fe3abe8e09fc2090986595a7 +SHA512 (cmake-3.26.0-rc5.tar.gz) = 329f4ee263f7e07e68f7e8df9cbbf8e18dd0c848af35d1d095987bb682c6faa6f3f453f9e3d01efece6bd1734e5f4895c0a49a391b80dbf57e98c05e524231bc From c1b5dc70f63d5317ee65532f27b2b5dbf5dd07c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 9 Mar 2023 12:35:31 +0100 Subject: [PATCH 130/238] cmake-3.26.0-rc6 Fixes rhbz#2176581 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index e57baa9..18de7f6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -65,7 +65,7 @@ %global patch_version 0 # Set to RC version if building RC, else comment out. -%global rcsuf rc5 +%global rcsuf rc6 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -529,6 +529,10 @@ popd %changelog +* Thu Mar 09 2023 Björn Esser - 3.26.0~rc6-1 +- cmake-3.26.0-rc6 + Fixes rhbz#2176581 + * Wed Mar 01 2023 Björn Esser - 3.26.0~rc5-1 - cmake-3.26.0-rc5 diff --git a/sources b/sources index 267fd3e..37e8e9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.26.0-rc5.tar.gz) = 329f4ee263f7e07e68f7e8df9cbbf8e18dd0c848af35d1d095987bb682c6faa6f3f453f9e3d01efece6bd1734e5f4895c0a49a391b80dbf57e98c05e524231bc +SHA512 (cmake-3.26.0-rc6.tar.gz) = 9df8382c37b61ad824558334f1b2b9b4bc8e6799de45e8f91c093c1056b7e58ea9fb8aece771b28a4963cf67c1e6b2225b18d5a8152ff54d92ca93a9526e5687 From 60f61a7432834fbfe8a5eb0985bc18707116330f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 14 Mar 2023 18:58:31 +0100 Subject: [PATCH 131/238] cmake-3.26.0 Fixes rhbz#2178221 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 18de7f6..98b842e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -65,7 +65,7 @@ %global patch_version 0 # Set to RC version if building RC, else comment out. -%global rcsuf rc6 +#global rcsuf rc1 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -529,6 +529,10 @@ popd %changelog +* Tue Mar 14 2023 Björn Esser - 3.26.0-1 +- cmake-3.26.0 + Fixes rhbz#2178221 + * Thu Mar 09 2023 Björn Esser - 3.26.0~rc6-1 - cmake-3.26.0-rc6 Fixes rhbz#2176581 diff --git a/sources b/sources index 37e8e9e..41af9af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.26.0-rc6.tar.gz) = 9df8382c37b61ad824558334f1b2b9b4bc8e6799de45e8f91c093c1056b7e58ea9fb8aece771b28a4963cf67c1e6b2225b18d5a8152ff54d92ca93a9526e5687 +SHA512 (cmake-3.26.0.tar.gz) = c9d166989abbae71002fe2fbe589c18794a0d6d2ff61fd197c473ff593066a1a17d12889cd875d63fa8824327c8ad165cb03d1f17e517dcef6b2de3b0f0ee789 From 7719ee4665b90170e697b59dc127f3e32f928f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 23 Mar 2023 15:51:08 +0100 Subject: [PATCH 132/238] cmake-3.26.1 Fixes rhbz#2181278 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 98b842e..62d7b95 100644 --- a/cmake.spec +++ b/cmake.spec @@ -62,7 +62,7 @@ %global major_version 3 %global minor_version 26 -%global patch_version 0 +%global patch_version 1 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -529,6 +529,10 @@ popd %changelog +* Thu Mar 23 2023 Björn Esser - 3.26.1-1 +- cmake-3.26.1 + Fixes rhbz#2181278 + * Tue Mar 14 2023 Björn Esser - 3.26.0-1 - cmake-3.26.0 Fixes rhbz#2178221 diff --git a/sources b/sources index 41af9af..9c2dee0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.26.0.tar.gz) = c9d166989abbae71002fe2fbe589c18794a0d6d2ff61fd197c473ff593066a1a17d12889cd875d63fa8824327c8ad165cb03d1f17e517dcef6b2de3b0f0ee789 +SHA512 (cmake-3.26.1.tar.gz) = e631e4f2277a640015a3c3a2690f0ff68577c4d04d2c39bda0b04afc142df4514b7a813c34e3f245c229ee0d6dcaf667a0f6fd8d76785ea2ff61f5295ae85ada From 8ca05850f981ec36a0eb66a87c120e7580b41bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 30 Mar 2023 10:18:55 +0200 Subject: [PATCH 133/238] cmake-3.26.2 Fixes rhbz#2182863 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 62d7b95..d361c70 100644 --- a/cmake.spec +++ b/cmake.spec @@ -62,7 +62,7 @@ %global major_version 3 %global minor_version 26 -%global patch_version 1 +%global patch_version 2 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -529,6 +529,10 @@ popd %changelog +* Thu Mar 30 2023 Björn Esser - 3.26.2-1 +- cmake-3.26.2 + Fixes rhbz#2182863 + * Thu Mar 23 2023 Björn Esser - 3.26.1-1 - cmake-3.26.1 Fixes rhbz#2181278 diff --git a/sources b/sources index 9c2dee0..5b4e820 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.26.1.tar.gz) = e631e4f2277a640015a3c3a2690f0ff68577c4d04d2c39bda0b04afc142df4514b7a813c34e3f245c229ee0d6dcaf667a0f6fd8d76785ea2ff61f5295ae85ada +SHA512 (cmake-3.26.2.tar.gz) = 7f4eefbffce2bad241261583b0b8962519dc266fa0c6c5ea6917a785eb2b81ebeda637ed9035965a43e9f89f072bc509d4583b5d595a7b72f5e54bb5170f7c9c From fa5e51275a4fcb9054651d3a8338e60b433c3bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 5 Apr 2023 15:38:00 +0200 Subject: [PATCH 134/238] cmake-3.26.3 Fixes rhbz#2184478 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index d361c70..65700d6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -62,7 +62,7 @@ %global major_version 3 %global minor_version 26 -%global patch_version 2 +%global patch_version 3 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -529,6 +529,10 @@ popd %changelog +* Wed Apr 05 2023 Björn Esser - 3.26.3-1 +- cmake-3.26.3 + Fixes rhbz#2184478 + * Thu Mar 30 2023 Björn Esser - 3.26.2-1 - cmake-3.26.2 Fixes rhbz#2182863 diff --git a/sources b/sources index 5b4e820..c3756d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.26.2.tar.gz) = 7f4eefbffce2bad241261583b0b8962519dc266fa0c6c5ea6917a785eb2b81ebeda637ed9035965a43e9f89f072bc509d4583b5d595a7b72f5e54bb5170f7c9c +SHA512 (cmake-3.26.3.tar.gz) = b09447318512b91c772e36c764049789224032c6c650289a94f6311f999ca104b617bf2dced57b723da23472f015549affabd9c8c076857490c47a1aee7eb7a0 From da3d78c9a2fac50a083f3a39d68429bf567939b2 Mon Sep 17 00:00:00 2001 From: Nianqing Yao Date: Fri, 5 May 2023 21:18:33 +0800 Subject: [PATCH 135/238] Fix build on riscv64 Co-authored-by: Liu Yang --- cmake.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmake.spec b/cmake.spec index 65700d6..8b3632b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -457,6 +457,10 @@ NO_TEST="$NO_TEST|CustomCommand|RunCMake.PositionIndependentCode" %if %{with bootstrap} NO_TEST="$NO_TEST|curl" %endif +%ifarch riscv64 +# These three tests timeout on riscv64, skip them. +NO_TEST="$NO_TEST|Qt5Autogen.ManySources|Qt5Autogen.MocInclude|Qt5Autogen.MocIncludeSymlink" +%endif bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure ## do this only periodically, not for every build -- besser82 20221102 # Keep an eye on failing tests @@ -529,6 +533,9 @@ popd %changelog +* Fri May 05 2023 Nianqing Yao - 3.26.3-2 +- Fix build on riscv64. + * Wed Apr 05 2023 Björn Esser - 3.26.3-1 - cmake-3.26.3 Fixes rhbz#2184478 From c30812977f5e327705d136cc3fc5a5c8f5bb8291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 8 May 2023 09:27:57 +0200 Subject: [PATCH 136/238] Bump baserelease --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 8b3632b..afe459f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -76,7 +76,7 @@ %endif # 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} From 40655d2d51b55bae1ef4ccb2f9b0ab7bd8e7a7e9 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 8 May 2023 10:13:01 +0200 Subject: [PATCH 137/238] Build cmake-gui with Qt6 --- cmake.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index afe459f..69f29b1 100644 --- a/cmake.spec +++ b/cmake.spec @@ -16,7 +16,7 @@ # Run git tests %bcond_without git_test -# Set to bcond_with or use --without gui to disable qt4 gui build +# Set to bcond_with or use --without gui to disable qt gui build %bcond_without gui # Use ncurses for colorful output @@ -178,7 +178,9 @@ BuildRequires: python2-devel %endif %endif %if %{with gui} -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?fedora} || 0%{?rhel} > 9 +BuildRequires: pkgconfig(Qt6Widgets) +%elif 0%{?rhel} > 7 BuildRequires: pkgconfig(Qt5Widgets) %else BuildRequires: pkgconfig(QtGui) From 607bce3339406cefd7b452eb7f3c25594b56df66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 8 May 2023 11:56:40 +0200 Subject: [PATCH 138/238] Fix changelog entry --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 69f29b1..7a6e0e6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -536,7 +536,7 @@ popd %changelog * Fri May 05 2023 Nianqing Yao - 3.26.3-2 -- Fix build on riscv64. +- Fix build on riscv64 * Wed Apr 05 2023 Björn Esser - 3.26.3-1 - cmake-3.26.3 From ef292f95240b4c1414889c6a99f01bfa4c33207b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 8 May 2023 11:57:24 +0200 Subject: [PATCH 139/238] Bump baserelease --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 7a6e0e6..b4baea5 100644 --- a/cmake.spec +++ b/cmake.spec @@ -76,7 +76,7 @@ %endif # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -535,6 +535,9 @@ popd %changelog +* Mon May 08 2023 Björn Esser - 3.26.3-3 +- Build cmake-gui with Qt6 + * Fri May 05 2023 Nianqing Yao - 3.26.3-2 - Fix build on riscv64 From 24f5e409dd0bd02ed7da43768ac1383d5809efd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 19 May 2023 09:53:34 +0200 Subject: [PATCH 140/238] cmake-3.26.4 Fixes rhbz#2208383 --- cmake.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index b4baea5..e53c6cc 100644 --- a/cmake.spec +++ b/cmake.spec @@ -62,7 +62,7 @@ %global major_version 3 %global minor_version 26 -%global patch_version 3 +%global patch_version 4 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -76,7 +76,7 @@ %endif # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 1 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -535,6 +535,10 @@ popd %changelog +* Fri May 19 2023 Björn Esser - 3.26.4-1 +- cmake-3.26.4 + Fixes rhbz#2208383 + * Mon May 08 2023 Björn Esser - 3.26.3-3 - Build cmake-gui with Qt6 diff --git a/sources b/sources index c3756d5..034e744 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.26.3.tar.gz) = b09447318512b91c772e36c764049789224032c6c650289a94f6311f999ca104b617bf2dced57b723da23472f015549affabd9c8c076857490c47a1aee7eb7a0 +SHA512 (cmake-3.26.4.tar.gz) = fe817c8d5e247db3f0a9a58ee37c466a47220100d9e90711cd5d06c223cef87e41d1a756e75d1537e5f8cd010dcb8971cbeab4684b1ac12bcecf84bf7b720167 From 16329cac894f80cb6256888bffb08232b054ba27 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 19 May 2023 07:16:59 -0400 Subject: [PATCH 141/238] macros: use the language build flag macros for compiler flags These macros have existed since 2018 and can be relied on in RHEL 8+ and all current Fedora releases. --- cmake.spec | 5 ++++- macros.cmake | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmake.spec b/cmake.spec index e53c6cc..6deb724 100644 --- a/cmake.spec +++ b/cmake.spec @@ -76,7 +76,7 @@ %endif # 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} @@ -535,6 +535,9 @@ popd %changelog +* Fri May 19 2023 Neal Gompa - 3.26.4-2 +- macros: use the language build flag macros for compiler flags + * Fri May 19 2023 Björn Esser - 3.26.4-1 - cmake-3.26.4 Fixes rhbz#2208383 diff --git a/macros.cmake b/macros.cmake index 63860a0..8e8575d 100644 --- a/macros.cmake +++ b/macros.cmake @@ -20,11 +20,11 @@ %if 0%{?set_build_flags:1} \ %set_build_flags \ %else \ - CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ - CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ - FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ - FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS ; \ - %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ + CFLAGS="${CFLAGS:-%build_cflags}" ; export CFLAGS ; \ + CXXFLAGS="${CXXFLAGS:-%build_cxxflags}" ; export CXXFLAGS ; \ + FFLAGS="${FFLAGS:-%build_fflags}" ; export FFLAGS ; \ + FCFLAGS="${FCFLAGS:-%build_fflags}" ; export FCFLAGS ; \ + %{?build_ldflags:LDFLAGS="${LDFLAGS:-%build_ldflags}" ; export LDFLAGS ;} \ %endif \ %__cmake \\\ %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\ From 3de71f17878a916555cce48ff117d273265bab5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 27 May 2023 19:07:03 +0200 Subject: [PATCH 142/238] Rename macros.cmake -> macros.cmake.in --- cmake.spec | 7 +++++-- macros.cmake => macros.cmake.in | 0 2 files changed, 5 insertions(+), 2 deletions(-) rename macros.cmake => macros.cmake.in (100%) diff --git a/cmake.spec b/cmake.spec index 6deb724..e6ab996 100644 --- a/cmake.spec +++ b/cmake.spec @@ -76,7 +76,7 @@ %endif # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -96,7 +96,7 @@ License: BSD and MIT and zlib URL: http://www.cmake.org Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{orig_name}-%{tar_version}.tar.gz Source1: %{name}-init.el -Source2: macros.%{name} +Source2: macros.%{name}.in # See https://bugzilla.redhat.com/show_bug.cgi?id=1202899 Source3: %{name}.attr Source4: %{name}.prov @@ -535,6 +535,9 @@ popd %changelog +* Sat May 27 2023 Björn Esser - 3.26.4-3 +- Rename macros.cmake -> macros.cmake.in + * Fri May 19 2023 Neal Gompa - 3.26.4-2 - macros: use the language build flag macros for compiler flags diff --git a/macros.cmake b/macros.cmake.in similarity index 100% rename from macros.cmake rename to macros.cmake.in From e8ab29358ae6692203fbd94b0818d1131b6c80e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 27 May 2023 19:08:15 +0200 Subject: [PATCH 143/238] macros: Fix formatting and indentation --- cmake.spec | 1 + macros.cmake.in | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index e6ab996..651a675 100644 --- a/cmake.spec +++ b/cmake.spec @@ -537,6 +537,7 @@ popd %changelog * Sat May 27 2023 Björn Esser - 3.26.4-3 - Rename macros.cmake -> macros.cmake.in +- macros: Fix formatting and indentation * Fri May 19 2023 Neal Gompa - 3.26.4-2 - macros: use the language build flag macros for compiler flags diff --git a/macros.cmake.in b/macros.cmake.in index 8e8575d..a96c705 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -9,9 +9,10 @@ %__ctest /usr/bin/ctest %__cmake_builddir %{!?__cmake_in_source_build:%{_vpath_builddir}}%{?__cmake_in_source_build:.} + # - Set default compile flags # - CMAKE_*_FLAGS_RELEASE are added *after* the *FLAGS environment variables -# and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS +# and default to -O3 -DNDEBUG. Strip the -O3 so we can override with *FLAGS # - Turn on verbose makefiles so we can see and verify compile flags # - Turn off stripping by default so RPM can do it separately # - Set default install prefixes and library install directories From 2a93bfd1de2e6c6f7acd6f702d97ac2d1509b701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 27 May 2023 19:10:21 +0200 Subject: [PATCH 144/238] macros: Directly use %set_build_flags, as it is supported since EPEL 7 --- cmake.spec | 1 + macros.cmake.in | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cmake.spec b/cmake.spec index 651a675..49ce42f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -538,6 +538,7 @@ popd * Sat May 27 2023 Björn Esser - 3.26.4-3 - Rename macros.cmake -> macros.cmake.in - macros: Fix formatting and indentation +- macros: Directly use %%set_build_flags, as it is supported since EPEL 7 * Fri May 19 2023 Neal Gompa - 3.26.4-2 - macros: use the language build flag macros for compiler flags diff --git a/macros.cmake.in b/macros.cmake.in index a96c705..5c9307a 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -18,15 +18,7 @@ # - Set default install prefixes and library install directories # - Turn on shared libraries by default %cmake \ -%if 0%{?set_build_flags:1} \ - %set_build_flags \ -%else \ - CFLAGS="${CFLAGS:-%build_cflags}" ; export CFLAGS ; \ - CXXFLAGS="${CXXFLAGS:-%build_cxxflags}" ; export CXXFLAGS ; \ - FFLAGS="${FFLAGS:-%build_fflags}" ; export FFLAGS ; \ - FCFLAGS="${FCFLAGS:-%build_fflags}" ; export FCFLAGS ; \ - %{?build_ldflags:LDFLAGS="${LDFLAGS:-%build_ldflags}" ; export LDFLAGS ;} \ -%endif \ + %{set_build_flags} \ %__cmake \\\ %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\ %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\ From 3b50d283fcf0c3bf2921fbc30adc800a869abe70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 27 May 2023 19:18:38 +0200 Subject: [PATCH 145/238] Fix %%changelog --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 49ce42f..dab8375 100644 --- a/cmake.spec +++ b/cmake.spec @@ -541,7 +541,7 @@ popd - macros: Directly use %%set_build_flags, as it is supported since EPEL 7 * Fri May 19 2023 Neal Gompa - 3.26.4-2 -- macros: use the language build flag macros for compiler flags +- macros: Use the language build flag macros for compiler flags * Fri May 19 2023 Björn Esser - 3.26.4-1 - cmake-3.26.4 From ae71be464b559997355261bd60fe5098b149674d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 27 May 2023 21:44:47 +0200 Subject: [PATCH 146/238] Exclude tests that are failing for rpm 4.19 --- cmake.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake.spec b/cmake.spec index dab8375..05c07e9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -455,6 +455,10 @@ pushd %{_vpath_builddir} NO_TEST="CTestTestUpload" # Likely failing for hardening flags from system. NO_TEST="$NO_TEST|CustomCommand|RunCMake.PositionIndependentCode" +# Failing for rpm 4.19 +NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-default" +NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-OnePackPerGroup" +NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-AllInOne" # curl test may fail during bootstrap %if %{with bootstrap} NO_TEST="$NO_TEST|curl" @@ -539,6 +543,7 @@ popd - Rename macros.cmake -> macros.cmake.in - macros: Fix formatting and indentation - macros: Directly use %%set_build_flags, as it is supported since EPEL 7 +- Exclude tests that are failing for rpm 4.19 * Fri May 19 2023 Neal Gompa - 3.26.4-2 - macros: Use the language build flag macros for compiler flags From fb7816c555e1c92b763fc8b05225d8c649c9c1b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 1 Jun 2023 15:00:49 +0200 Subject: [PATCH 147/238] Backport several bugfixes and support for Boost v1.82 from upstream --- ...ncoding-when-opening-files-for-title.patch | 44 ++++++++++++++ ...-UTF-8-encoding-handling-when-updati.patch | 44 ++++++++++++++ ...-Always-load-presets-schema-as-UTF-8.patch | 45 ++++++++++++++ ...mpilerABI-Avoid-removing-the-flag-af.patch | 38 ++++++++++++ ...FindBoost-Add-support-for-Boost-1.82.patch | 60 +++++++++++++++++++ cmake.spec | 12 +++- 6 files changed, 242 insertions(+), 1 deletion(-) create mode 100644 0001-Sphinx-Specify-encoding-when-opening-files-for-title.patch create mode 100644 0002-Sphinx-Modernize-UTF-8-encoding-handling-when-updati.patch create mode 100644 0003-Tests-Always-load-presets-schema-as-UTF-8.patch create mode 100644 0004-CMakeDetermineCompilerABI-Avoid-removing-the-flag-af.patch create mode 100644 0005-FindBoost-Add-support-for-Boost-1.82.patch diff --git a/0001-Sphinx-Specify-encoding-when-opening-files-for-title.patch b/0001-Sphinx-Specify-encoding-when-opening-files-for-title.patch new file mode 100644 index 0000000..e086c44 --- /dev/null +++ b/0001-Sphinx-Specify-encoding-when-opening-files-for-title.patch @@ -0,0 +1,44 @@ +From 853f069103f00b3f487833787b5388c7e79ff3c3 Mon Sep 17 00:00:00 2001 +From: Craig Scott +Date: Fri, 7 Apr 2023 18:11:05 +1000 +Subject: [PATCH 1/5] Sphinx: Specify encoding when opening files for title + extraction +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When the encoding is not specified, open() may choose an encoding +based on the locale in use. That encoding may have no relationship +to the encoding of the file being opened. Use the locale from the +document settings instead, which should better match the file's +encoding. + +Fixes: #24679 +Signed-off-by: Björn Esser +--- + Utilities/Sphinx/cmake.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py +index 47e4909ba0..e4e06aba1a 100644 +--- a/Utilities/Sphinx/cmake.py ++++ b/Utilities/Sphinx/cmake.py +@@ -224,12 +224,13 @@ class CMakeTransform(Transform): + The cmake --help-*-list commands also depend on this convention. + Return the title or False if the document file does not exist. + """ +- env = self.document.settings.env ++ settings = self.document.settings ++ env = settings.env + title = self.titles.get(docname) + if title is None: + fname = os.path.join(env.srcdir, docname+'.rst') + try: +- f = open(fname, 'r') ++ f = open(fname, 'r', encoding=settings.input_encoding) + except IOError: + title = False + else: +-- +2.40.1 + diff --git a/0002-Sphinx-Modernize-UTF-8-encoding-handling-when-updati.patch b/0002-Sphinx-Modernize-UTF-8-encoding-handling-when-updati.patch new file mode 100644 index 0000000..f16a500 --- /dev/null +++ b/0002-Sphinx-Modernize-UTF-8-encoding-handling-when-updati.patch @@ -0,0 +1,44 @@ +From fc2b60ca6b23a7204043075e0c04a727d5b6a06b Mon Sep 17 00:00:00 2001 +From: Craig Scott +Date: Fri, 7 Apr 2023 18:14:18 +1000 +Subject: [PATCH 2/5] Sphinx: Modernize UTF-8 encoding handling when updating + CMake.qhp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Björn Esser +--- + Utilities/Sphinx/create_identifiers.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Utilities/Sphinx/create_identifiers.py b/Utilities/Sphinx/create_identifiers.py +index 0ff39a0c2a..61dd819b42 100755 +--- a/Utilities/Sphinx/create_identifiers.py ++++ b/Utilities/Sphinx/create_identifiers.py +@@ -6,12 +6,12 @@ if len(sys.argv) != 2: + sys.exit(-1) + name = sys.argv[1] + "/CMake.qhp" + +-f = open(name, "rb") ++f = open(name, "r", encoding="utf-8") + + if not f: + sys.exit(-1) + +-lines = f.read().decode("utf-8").splitlines() ++lines = f.read().splitlines() + + if not lines: + sys.exit(-1) +@@ -47,5 +47,5 @@ for line in lines: + line = part1 + prefix + "id=\"" + domain_object_type + "/" + domain_object + "\" " + part2 + newlines.append(line + "\n") + +-f = open(name, "wb") +-f.writelines(map(lambda line: line.encode("utf-8"), newlines)) ++f = open(name, "w", encoding="utf-8") ++f.writelines(newlines) +-- +2.40.1 + diff --git a/0003-Tests-Always-load-presets-schema-as-UTF-8.patch b/0003-Tests-Always-load-presets-schema-as-UTF-8.patch new file mode 100644 index 0000000..cb7573c --- /dev/null +++ b/0003-Tests-Always-load-presets-schema-as-UTF-8.patch @@ -0,0 +1,45 @@ +From e4f26edc1c1bb999b12df83f41459fe7174bef29 Mon Sep 17 00:00:00 2001 +From: Craig Scott +Date: Fri, 7 Apr 2023 18:21:27 +1000 +Subject: [PATCH 3/5] Tests: Always load presets schema as UTF-8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We know the encoding of the schema file, so we should specify it +when we open it for reading. Previously, by not specifying it, the test +was open to using an encoding based on the active locale when +running the test. We may have been enforcing a "C" locale at a higher +level, but we don't need to rely on that here, we can force correct +behavior without that assumption. + +Issue: #24679 +Signed-off-by: Björn Esser +--- + Tests/RunCMake/CMakePresets/validate_schema.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Tests/RunCMake/CMakePresets/validate_schema.py b/Tests/RunCMake/CMakePresets/validate_schema.py +index b2a67fc4b9..836147aab2 100644 +--- a/Tests/RunCMake/CMakePresets/validate_schema.py ++++ b/Tests/RunCMake/CMakePresets/validate_schema.py +@@ -4,13 +4,13 @@ import os.path + import sys + + +-with open(sys.argv[1], "rb") as f: +- contents = json.loads(f.read().decode("utf-8-sig")) ++with open(sys.argv[1], "r", encoding="utf-8-sig") as f: ++ contents = json.load(f) + + schema_file = os.path.join( + os.path.dirname(__file__), + "..", "..", "..", "Help", "manual", "presets", "schema.json") +-with open(schema_file) as f: ++with open(schema_file, "r", encoding="utf-8") as f: + schema = json.load(f) + + jsonschema.validate(contents, schema) +-- +2.40.1 + diff --git a/0004-CMakeDetermineCompilerABI-Avoid-removing-the-flag-af.patch b/0004-CMakeDetermineCompilerABI-Avoid-removing-the-flag-af.patch new file mode 100644 index 0000000..5c97dc8 --- /dev/null +++ b/0004-CMakeDetermineCompilerABI-Avoid-removing-the-flag-af.patch @@ -0,0 +1,38 @@ +From cec6f980181d9ca88ff53f0b1626713ed98a3369 Mon Sep 17 00:00:00 2001 +From: Raul Tambre +Date: Mon, 29 May 2023 17:18:55 +0300 +Subject: [PATCH 4/5] CMakeDetermineCompilerABI: Avoid removing the flag after + -Werror +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The matching became too eager after commit 079ea66468 +(CMakeDetermineCompilerABI: Handle NVCC-style -Werror flags, 2020-10-04, +v3.19.0-rc1~45^2). When -Werror was specified without a value we would +eat the following flag. Prevent this by disallowing "-" as the first +character of the flag's value. + +Fixes: 079ea66468a6ffe0b02c3d6622bc0230fdf455b0 +See-also: https://discourse.cmake.org/t/8230 +Signed-off-by: Björn Esser +--- + Modules/CMakeDetermineCompilerABI.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake +index 3fd54cc7ef..df177968c3 100644 +--- a/Modules/CMakeDetermineCompilerABI.cmake ++++ b/Modules/CMakeDetermineCompilerABI.cmake +@@ -42,7 +42,7 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src) + __TestCompiler_setTryCompileTargetType() + + # Avoid failing ABI detection on warnings. +- string(REGEX REPLACE "(^| )-Werror([= ][^ ]*)?( |$)" " " CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}") ++ string(REGEX REPLACE "(^| )-Werror([= ][^-][^ ]*)?( |$)" " " CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}") + + # Save the current LC_ALL, LC_MESSAGES, and LANG environment variables + # and set them to "C" that way GCC's "search starts here" text is in +-- +2.40.1 + diff --git a/0005-FindBoost-Add-support-for-Boost-1.82.patch b/0005-FindBoost-Add-support-for-Boost-1.82.patch new file mode 100644 index 0000000..318bfca --- /dev/null +++ b/0005-FindBoost-Add-support-for-Boost-1.82.patch @@ -0,0 +1,60 @@ +From 5cbbe55de85bdd0d6d90241a9b18683f13375fc1 Mon Sep 17 00:00:00 2001 +From: huangqinjin +Date: Sun, 28 May 2023 17:13:18 +0800 +Subject: [PATCH 5/5] FindBoost: Add support for Boost 1.82 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Update the list of known versions. + +There is a new header-only library, Boost.MySQL. It has no +dependencies and has a core header ``. + +Run the command + + cmake -DBOOST_DIR=/path/to/boost_1_82_0 \ + -P Utilities/Scripts/BoostScanDeps.cmake + +to extract dependencies from the 1.82.0 source tree. +They are the same as 1.81's dependencies, so just update +the version check for warning about newer versions. + +Signed-off-by: Björn Esser +--- + Modules/FindBoost.cmake | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake +index 72a9a4c192..f2e4804d04 100644 +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -1380,7 +1380,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + set(_Boost_TIMER_DEPENDENCIES chrono) + set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) +- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.82.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) ++ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.83.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) + message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") + endif() + endif() +@@ -1445,6 +1445,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs) + set(_Boost_MATH_TR1L_HEADERS "boost/math/tr1.hpp") + set(_Boost_MPI_HEADERS "boost/mpi.hpp") + set(_Boost_MPI_PYTHON_HEADERS "boost/mpi/python/config.hpp") ++ set(_Boost_MYSQL_HEADERS "boost/mysql.hpp") + set(_Boost_NUMPY_HEADERS "boost/python/numpy.hpp") + set(_Boost_NOWIDE_HEADERS "boost/nowide/cstdlib.hpp") + set(_Boost_PRG_EXEC_MONITOR_HEADERS "boost/test/prg_exec_monitor.hpp") +@@ -1654,7 +1655,7 @@ else() + # _Boost_COMPONENT_HEADERS. See the instructions at the top of + # _Boost_COMPONENT_DEPENDENCIES. + set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} +- "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79" ++ "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79" + "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" + "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" + "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" +-- +2.40.1 + diff --git a/cmake.spec b/cmake.spec index 05c07e9..d92b248 100644 --- a/cmake.spec +++ b/cmake.spec @@ -76,7 +76,7 @@ %endif # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -121,6 +121,13 @@ Patch102: %{name}-mingw-dl.patch Patch1: %{name}-rename.patch %endif +# Backported from upstream. +Patch10001: 0001-Sphinx-Specify-encoding-when-opening-files-for-title.patch +Patch10002: 0002-Sphinx-Modernize-UTF-8-encoding-handling-when-updati.patch +Patch10003: 0003-Tests-Always-load-presets-schema-as-UTF-8.patch +Patch10004: 0004-CMakeDetermineCompilerABI-Avoid-removing-the-flag-af.patch +Patch10005: 0005-FindBoost-Add-support-for-Boost-1.82.patch + BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc-c++ @@ -539,6 +546,9 @@ popd %changelog +* Thu Jun 01 2023 Björn Esser - 3.26.4-4 +- Backport several bugfixes and support for Boost v1.82 from upstream + * Sat May 27 2023 Björn Esser - 3.26.4-3 - Rename macros.cmake -> macros.cmake.in - macros: Fix formatting and indentation From 29494dc73446ea9b251272a1c6279d2c1ac858b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 30 May 2023 20:38:49 +0200 Subject: [PATCH 148/238] cmake-3.27.0-rc1 --- ...ncoding-when-opening-files-for-title.patch | 44 -------------- ...-UTF-8-encoding-handling-when-updati.patch | 44 -------------- ...-Always-load-presets-schema-as-UTF-8.patch | 45 -------------- ...mpilerABI-Avoid-removing-the-flag-af.patch | 38 ------------ ...FindBoost-Add-support-for-Boost-1.82.patch | 60 ------------------- cmake-mingw-dl.patch | 18 ------ cmake.spec | 35 +++-------- sources | 2 +- 8 files changed, 10 insertions(+), 276 deletions(-) delete mode 100644 0001-Sphinx-Specify-encoding-when-opening-files-for-title.patch delete mode 100644 0002-Sphinx-Modernize-UTF-8-encoding-handling-when-updati.patch delete mode 100644 0003-Tests-Always-load-presets-schema-as-UTF-8.patch delete mode 100644 0004-CMakeDetermineCompilerABI-Avoid-removing-the-flag-af.patch delete mode 100644 0005-FindBoost-Add-support-for-Boost-1.82.patch delete mode 100644 cmake-mingw-dl.patch diff --git a/0001-Sphinx-Specify-encoding-when-opening-files-for-title.patch b/0001-Sphinx-Specify-encoding-when-opening-files-for-title.patch deleted file mode 100644 index e086c44..0000000 --- a/0001-Sphinx-Specify-encoding-when-opening-files-for-title.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 853f069103f00b3f487833787b5388c7e79ff3c3 Mon Sep 17 00:00:00 2001 -From: Craig Scott -Date: Fri, 7 Apr 2023 18:11:05 +1000 -Subject: [PATCH 1/5] Sphinx: Specify encoding when opening files for title - extraction -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When the encoding is not specified, open() may choose an encoding -based on the locale in use. That encoding may have no relationship -to the encoding of the file being opened. Use the locale from the -document settings instead, which should better match the file's -encoding. - -Fixes: #24679 -Signed-off-by: Björn Esser ---- - Utilities/Sphinx/cmake.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py -index 47e4909ba0..e4e06aba1a 100644 ---- a/Utilities/Sphinx/cmake.py -+++ b/Utilities/Sphinx/cmake.py -@@ -224,12 +224,13 @@ class CMakeTransform(Transform): - The cmake --help-*-list commands also depend on this convention. - Return the title or False if the document file does not exist. - """ -- env = self.document.settings.env -+ settings = self.document.settings -+ env = settings.env - title = self.titles.get(docname) - if title is None: - fname = os.path.join(env.srcdir, docname+'.rst') - try: -- f = open(fname, 'r') -+ f = open(fname, 'r', encoding=settings.input_encoding) - except IOError: - title = False - else: --- -2.40.1 - diff --git a/0002-Sphinx-Modernize-UTF-8-encoding-handling-when-updati.patch b/0002-Sphinx-Modernize-UTF-8-encoding-handling-when-updati.patch deleted file mode 100644 index f16a500..0000000 --- a/0002-Sphinx-Modernize-UTF-8-encoding-handling-when-updati.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fc2b60ca6b23a7204043075e0c04a727d5b6a06b Mon Sep 17 00:00:00 2001 -From: Craig Scott -Date: Fri, 7 Apr 2023 18:14:18 +1000 -Subject: [PATCH 2/5] Sphinx: Modernize UTF-8 encoding handling when updating - CMake.qhp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Björn Esser ---- - Utilities/Sphinx/create_identifiers.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Utilities/Sphinx/create_identifiers.py b/Utilities/Sphinx/create_identifiers.py -index 0ff39a0c2a..61dd819b42 100755 ---- a/Utilities/Sphinx/create_identifiers.py -+++ b/Utilities/Sphinx/create_identifiers.py -@@ -6,12 +6,12 @@ if len(sys.argv) != 2: - sys.exit(-1) - name = sys.argv[1] + "/CMake.qhp" - --f = open(name, "rb") -+f = open(name, "r", encoding="utf-8") - - if not f: - sys.exit(-1) - --lines = f.read().decode("utf-8").splitlines() -+lines = f.read().splitlines() - - if not lines: - sys.exit(-1) -@@ -47,5 +47,5 @@ for line in lines: - line = part1 + prefix + "id=\"" + domain_object_type + "/" + domain_object + "\" " + part2 - newlines.append(line + "\n") - --f = open(name, "wb") --f.writelines(map(lambda line: line.encode("utf-8"), newlines)) -+f = open(name, "w", encoding="utf-8") -+f.writelines(newlines) --- -2.40.1 - diff --git a/0003-Tests-Always-load-presets-schema-as-UTF-8.patch b/0003-Tests-Always-load-presets-schema-as-UTF-8.patch deleted file mode 100644 index cb7573c..0000000 --- a/0003-Tests-Always-load-presets-schema-as-UTF-8.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e4f26edc1c1bb999b12df83f41459fe7174bef29 Mon Sep 17 00:00:00 2001 -From: Craig Scott -Date: Fri, 7 Apr 2023 18:21:27 +1000 -Subject: [PATCH 3/5] Tests: Always load presets schema as UTF-8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We know the encoding of the schema file, so we should specify it -when we open it for reading. Previously, by not specifying it, the test -was open to using an encoding based on the active locale when -running the test. We may have been enforcing a "C" locale at a higher -level, but we don't need to rely on that here, we can force correct -behavior without that assumption. - -Issue: #24679 -Signed-off-by: Björn Esser ---- - Tests/RunCMake/CMakePresets/validate_schema.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Tests/RunCMake/CMakePresets/validate_schema.py b/Tests/RunCMake/CMakePresets/validate_schema.py -index b2a67fc4b9..836147aab2 100644 ---- a/Tests/RunCMake/CMakePresets/validate_schema.py -+++ b/Tests/RunCMake/CMakePresets/validate_schema.py -@@ -4,13 +4,13 @@ import os.path - import sys - - --with open(sys.argv[1], "rb") as f: -- contents = json.loads(f.read().decode("utf-8-sig")) -+with open(sys.argv[1], "r", encoding="utf-8-sig") as f: -+ contents = json.load(f) - - schema_file = os.path.join( - os.path.dirname(__file__), - "..", "..", "..", "Help", "manual", "presets", "schema.json") --with open(schema_file) as f: -+with open(schema_file, "r", encoding="utf-8") as f: - schema = json.load(f) - - jsonschema.validate(contents, schema) --- -2.40.1 - diff --git a/0004-CMakeDetermineCompilerABI-Avoid-removing-the-flag-af.patch b/0004-CMakeDetermineCompilerABI-Avoid-removing-the-flag-af.patch deleted file mode 100644 index 5c97dc8..0000000 --- a/0004-CMakeDetermineCompilerABI-Avoid-removing-the-flag-af.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cec6f980181d9ca88ff53f0b1626713ed98a3369 Mon Sep 17 00:00:00 2001 -From: Raul Tambre -Date: Mon, 29 May 2023 17:18:55 +0300 -Subject: [PATCH 4/5] CMakeDetermineCompilerABI: Avoid removing the flag after - -Werror -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The matching became too eager after commit 079ea66468 -(CMakeDetermineCompilerABI: Handle NVCC-style -Werror flags, 2020-10-04, -v3.19.0-rc1~45^2). When -Werror was specified without a value we would -eat the following flag. Prevent this by disallowing "-" as the first -character of the flag's value. - -Fixes: 079ea66468a6ffe0b02c3d6622bc0230fdf455b0 -See-also: https://discourse.cmake.org/t/8230 -Signed-off-by: Björn Esser ---- - Modules/CMakeDetermineCompilerABI.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake -index 3fd54cc7ef..df177968c3 100644 ---- a/Modules/CMakeDetermineCompilerABI.cmake -+++ b/Modules/CMakeDetermineCompilerABI.cmake -@@ -42,7 +42,7 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src) - __TestCompiler_setTryCompileTargetType() - - # Avoid failing ABI detection on warnings. -- string(REGEX REPLACE "(^| )-Werror([= ][^ ]*)?( |$)" " " CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}") -+ string(REGEX REPLACE "(^| )-Werror([= ][^-][^ ]*)?( |$)" " " CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}") - - # Save the current LC_ALL, LC_MESSAGES, and LANG environment variables - # and set them to "C" that way GCC's "search starts here" text is in --- -2.40.1 - diff --git a/0005-FindBoost-Add-support-for-Boost-1.82.patch b/0005-FindBoost-Add-support-for-Boost-1.82.patch deleted file mode 100644 index 318bfca..0000000 --- a/0005-FindBoost-Add-support-for-Boost-1.82.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5cbbe55de85bdd0d6d90241a9b18683f13375fc1 Mon Sep 17 00:00:00 2001 -From: huangqinjin -Date: Sun, 28 May 2023 17:13:18 +0800 -Subject: [PATCH 5/5] FindBoost: Add support for Boost 1.82 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Update the list of known versions. - -There is a new header-only library, Boost.MySQL. It has no -dependencies and has a core header ``. - -Run the command - - cmake -DBOOST_DIR=/path/to/boost_1_82_0 \ - -P Utilities/Scripts/BoostScanDeps.cmake - -to extract dependencies from the 1.82.0 source tree. -They are the same as 1.81's dependencies, so just update -the version check for warning about newer versions. - -Signed-off-by: Björn Esser ---- - Modules/FindBoost.cmake | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index 72a9a4c192..f2e4804d04 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -1380,7 +1380,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - set(_Boost_TIMER_DEPENDENCIES chrono) - set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) - set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) -- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.82.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) -+ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.83.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) - message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") - endif() - endif() -@@ -1445,6 +1445,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs) - set(_Boost_MATH_TR1L_HEADERS "boost/math/tr1.hpp") - set(_Boost_MPI_HEADERS "boost/mpi.hpp") - set(_Boost_MPI_PYTHON_HEADERS "boost/mpi/python/config.hpp") -+ set(_Boost_MYSQL_HEADERS "boost/mysql.hpp") - set(_Boost_NUMPY_HEADERS "boost/python/numpy.hpp") - set(_Boost_NOWIDE_HEADERS "boost/nowide/cstdlib.hpp") - set(_Boost_PRG_EXEC_MONITOR_HEADERS "boost/test/prg_exec_monitor.hpp") -@@ -1654,7 +1655,7 @@ else() - # _Boost_COMPONENT_HEADERS. See the instructions at the top of - # _Boost_COMPONENT_DEPENDENCIES. - set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} -- "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79" -+ "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79" - "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" - "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" - "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" --- -2.40.1 - diff --git a/cmake-mingw-dl.patch b/cmake-mingw-dl.patch deleted file mode 100644 index 9934788..0000000 --- a/cmake-mingw-dl.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: cmake-3.23.0-rc2/Modules/Platform/Windows-GNU.cmake -=================================================================== ---- cmake-3.23.0-rc2.orig/Modules/Platform/Windows-GNU.cmake -+++ cmake-3.23.0-rc2/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 - - 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 d92b248..c1d4503 100644 --- a/cmake.spec +++ b/cmake.spec @@ -61,11 +61,14 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 26 -%global patch_version 4 +%global minor_version 27 +%global patch_version 0 + +# For handling bump release by rpmdev-bumpspec and mass rebuild +%global baserelease 1 # Set to RC version if building RC, else comment out. -#global rcsuf rc1 +%global rcsuf rc1 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -75,9 +78,6 @@ %global tar_version %{major_version}.%{minor_version}.%{patch_version} %endif -# For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 4 - # Uncomment if building for EPEL #global name_suffix %%{major_version} %global orig_name cmake @@ -110,24 +110,12 @@ Source5: %{name}.req # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch -# Add dl to CMAKE_DL_LIBS on MINGW -# https://gitlab.kitware.com/cmake/cmake/issues/17600 -%if 0%{?fedora} && 0%{?fedora} < 38 -Patch102: %{name}-mingw-dl.patch -%endif # Patch for renaming on EPEL %if 0%{?name_suffix:1} Patch1: %{name}-rename.patch %endif -# Backported from upstream. -Patch10001: 0001-Sphinx-Specify-encoding-when-opening-files-for-title.patch -Patch10002: 0002-Sphinx-Modernize-UTF-8-encoding-handling-when-updati.patch -Patch10003: 0003-Tests-Always-load-presets-schema-as-UTF-8.patch -Patch10004: 0004-CMakeDetermineCompilerABI-Avoid-removing-the-flag-af.patch -Patch10005: 0005-FindBoost-Add-support-for-Boost-1.82.patch - BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc-c++ @@ -305,15 +293,7 @@ tail -n +2 %{SOURCE5} >> %{name}.req %build -%if 0%{?set_build_flags:1} %{set_build_flags} -%else -CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS -CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS -FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS -FCFLAGS="${FCFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FCFLAGS -%{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} -%endif SRCDIR="$(/usr/bin/pwd)" mkdir %{_vpath_builddir} pushd %{_vpath_builddir} @@ -546,6 +526,9 @@ popd %changelog +* Thu Jun 08 2023 Björn Esser - 3.27.0~rc1-1 +- cmake-3.27.0-rc1 + * Thu Jun 01 2023 Björn Esser - 3.26.4-4 - Backport several bugfixes and support for Boost v1.82 from upstream diff --git a/sources b/sources index 034e744..e62f032 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.26.4.tar.gz) = fe817c8d5e247db3f0a9a58ee37c466a47220100d9e90711cd5d06c223cef87e41d1a756e75d1537e5f8cd010dcb8971cbeab4684b1ac12bcecf84bf7b720167 +SHA512 (cmake-3.27.0-rc1.tar.gz) = 02ea3ed06ccc339980235371de0b3c823f92cdd46bc4de3b0bb5788cd1265c292e70dd824d2fd3740ec67fa63a5e2a903a32735f6073d8843465e300ccef5e6d From f71762392dde00b4a7ce8eda7d8f6e90d21496a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 8 Jun 2023 20:51:55 +0200 Subject: [PATCH 149/238] Use CMake-provided cppdap It is currently shipped as a static lib from the upstream developers, and for that reason we do not have it in the repos. --- ...o-system-cppdap-configuration-switch.patch | 42 +++++++++++++++++++ cmake.spec | 15 +++++++ 2 files changed, 57 insertions(+) create mode 100644 0001-bootstrap-Add-no-system-cppdap-configuration-switch.patch diff --git a/0001-bootstrap-Add-no-system-cppdap-configuration-switch.patch b/0001-bootstrap-Add-no-system-cppdap-configuration-switch.patch new file mode 100644 index 0000000..f5d8fcb --- /dev/null +++ b/0001-bootstrap-Add-no-system-cppdap-configuration-switch.patch @@ -0,0 +1,42 @@ +From 3e4cc3841006819dfefe6f0735b4f120f8d4f8f8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Thu, 8 Jun 2023 20:44:46 +0200 +Subject: [PATCH] bootstrap: Add --(no-)system-cppdap configuration switch. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Björn Esser +--- + bootstrap | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/bootstrap b/bootstrap +index 109e450548..cc604256d8 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -667,6 +667,8 @@ Configuration: + (for use only by package maintainers) + --no-system-libs use all cmake-provided third-party libraries + (default) ++ --system-cppdap use system-installed cppdap library ++ --no-system-cppdap use cmake-provided cppdap library (default) + --system-curl use system-installed curl library + --no-system-curl use cmake-provided curl library (default) + --system-expat use system-installed expat library +@@ -954,10 +956,10 @@ while test $# != 0; do + --init=*) cmake_init_file=`cmake_arg "$1"` ;; + --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;; + --no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;; +- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-nghttp2|--system-zstd|--system-libuv) ++ --system-bzip2|--system-cppdap|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-nghttp2|--system-zstd|--system-libuv) + lib=`cmake_arg "$1" "--system-"` + cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;; +- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-nghttp2|--no-system-zstd|--no-system-libuv) ++ --no-system-bzip2|--no-system-cppdap|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-nghttp2|--no-system-zstd|--no-system-libuv) + lib=`cmake_arg "$1" "--no-system-"` + cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;; + --bootstrap-system-libuv) bootstrap_system_libuv="1" ;; +-- +2.40.1 + diff --git a/cmake.spec b/cmake.spec index c1d4503..4c5264f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -42,6 +42,10 @@ %bcond_without bundled_rhash %endif +# cppdap is currently shipped as a static lib from upstream, +# so we do not have it in the repos. +%bcond_without bundled_cppdap + # Run tests %bcond_without test @@ -110,6 +114,8 @@ Source5: %{name}.req # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch +# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8550 +Patch101: 0001-bootstrap-Add-no-system-cppdap-configuration-switch.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -139,6 +145,11 @@ BuildRequires: %{_bindir}/sphinx-build %if %{without bootstrap} BuildRequires: bzip2-devel BuildRequires: curl-devel +%if %{with bundled_cppdap} +Provides: bundled(cppdap) +%else +BuildRequires: cppdap-devel +%endif BuildRequires: expat-devel %if %{with bundled_jsoncpp} Provides: bundled(jsoncpp) @@ -303,6 +314,9 @@ $SRCDIR/bootstrap --prefix=%{_prefix} \ --mandir=/share/man \ --%{?with_bootstrap:no-}system-libs \ --parallel="$(echo %{?_smp_mflags} | sed -e 's|-j||g')" \ +%if %{with bundled_cppdap} + --no-system-cppdap \ +%endif %if %{with bundled_rhash} --no-system-librhash \ %endif @@ -528,6 +542,7 @@ popd %changelog * Thu Jun 08 2023 Björn Esser - 3.27.0~rc1-1 - cmake-3.27.0-rc1 +- Use CMake-provided cppdap * Thu Jun 01 2023 Björn Esser - 3.26.4-4 - Backport several bugfixes and support for Boost v1.82 from upstream From b48f5368e60e8b0c4da8139003cff5e2fc467acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 8 Jun 2023 21:34:35 +0200 Subject: [PATCH 150/238] Add licensing information for cppdap to packaged files if needed --- cmake.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 4c5264f..b14f53a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -96,7 +96,7 @@ Summary: Cross-platform make system # Source/kwsys/MD5.c is zlib # some GPL-licensed bison-generated files, which all include an # exception granting redistribution under terms of your choice -License: BSD and MIT and zlib +License: BSD and MIT and zlib%{?with bundled_cppdap: and Apache-2.0} URL: http://www.cmake.org Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{orig_name}-%{tar_version}.tar.gz Source1: %{name}-init.el @@ -377,6 +377,10 @@ do dname=$(basename $dir) cp -p $f ./${fname}_${dname} done +%if %{with bundled_cppdap} +cp -p Utilities/cmcppdap/LICENSE{,.cppdap} +cp -p Utilities/cmcppdap/NOTICE{,.cppdap} +%endif # Cleanup pre-installed documentation %if %{with sphinx} mv %{buildroot}%{_docdir}/%{name}/html . @@ -480,6 +484,10 @@ popd %doc %dir %{_pkgdocdir} %license Copyright.txt* %license COPYING* +%if %{with bundled_cppdap} +%license LICENSE.cppdap +%license NOTICE.cppdap +%endif %if %{with sphinx} %{_mandir}/man1/c%{name}.1.* %{_mandir}/man1/%{name}.1.* @@ -543,6 +551,7 @@ popd * Thu Jun 08 2023 Björn Esser - 3.27.0~rc1-1 - cmake-3.27.0-rc1 - Use CMake-provided cppdap +- Add licensing information for cppdap to packaged files if needed * Thu Jun 01 2023 Björn Esser - 3.26.4-4 - Backport several bugfixes and support for Boost v1.82 from upstream From bda724cdc3898edc85f95757ab3e338e3340ced6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 8 Jun 2023 21:42:06 +0200 Subject: [PATCH 151/238] Fix evaluation of license tag --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index b14f53a..2428f5b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -96,7 +96,7 @@ Summary: Cross-platform make system # Source/kwsys/MD5.c is zlib # some GPL-licensed bison-generated files, which all include an # exception granting redistribution under terms of your choice -License: BSD and MIT and zlib%{?with bundled_cppdap: and Apache-2.0} +License: BSD and MIT and zlib%{?with_bundled_cppdap: and Apache-2.0} URL: http://www.cmake.org Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{orig_name}-%{tar_version}.tar.gz Source1: %{name}-init.el From 37488cd73fd038681adf95391b3ebe3b6c15b47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 8 Jun 2023 22:07:58 +0200 Subject: [PATCH 152/238] Fix copy-rename of cppdap license files --- cmake.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 2428f5b..b92e359 100644 --- a/cmake.spec +++ b/cmake.spec @@ -378,8 +378,8 @@ do cp -p $f ./${fname}_${dname} done %if %{with bundled_cppdap} -cp -p Utilities/cmcppdap/LICENSE{,.cppdap} -cp -p Utilities/cmcppdap/NOTICE{,.cppdap} +cp -p Utilities/cmcppdap/LICENSE LICENSE.cppdap +cp -p Utilities/cmcppdap/NOTICE NOTICE.cppdap %endif # Cleanup pre-installed documentation %if %{with sphinx} From 6412e59e9168dfbc33ae8f998ad1acec060e6724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 9 Jun 2023 06:09:50 +0200 Subject: [PATCH 153/238] Exclude tests that started failing --- cmake.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmake.spec b/cmake.spec index b92e359..2f9eee5 100644 --- a/cmake.spec +++ b/cmake.spec @@ -464,6 +464,13 @@ NO_TEST="$NO_TEST|CustomCommand|RunCMake.PositionIndependentCode" NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-default" NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-OnePackPerGroup" NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-AllInOne" +# Failing in 3.27.0-rc1 for some regex mismatch, +# but command actually succeeds. +NO_TEST="$NO_TEST|RunCMake.Make" +NO_TEST="$NO_TEST|RunCMake.BuildDepends" +# Failing in 3.27.0-rc1 for some timestamp quirks. +NO_TEST="$NO_TEST|Qt6Autogen.RerunMocBasic" +NO_TEST="$NO_TEST|Qt6Autogen.RerunRccDepends" # curl test may fail during bootstrap %if %{with bootstrap} NO_TEST="$NO_TEST|curl" @@ -552,6 +559,7 @@ popd - cmake-3.27.0-rc1 - Use CMake-provided cppdap - Add licensing information for cppdap to packaged files if needed +- Exclude tests that started failing * Thu Jun 01 2023 Björn Esser - 3.26.4-4 - Backport several bugfixes and support for Boost v1.82 from upstream From a6a357b9e157095c23c691db76cb466b2a8207cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 12 Jun 2023 20:16:21 +0200 Subject: [PATCH 154/238] cmake-3.27.0-rc2 --- ...o-system-cppdap-configuration-switch.patch | 42 ------------------- cmake.spec | 7 ++-- sources | 2 +- 3 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 0001-bootstrap-Add-no-system-cppdap-configuration-switch.patch diff --git a/0001-bootstrap-Add-no-system-cppdap-configuration-switch.patch b/0001-bootstrap-Add-no-system-cppdap-configuration-switch.patch deleted file mode 100644 index f5d8fcb..0000000 --- a/0001-bootstrap-Add-no-system-cppdap-configuration-switch.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3e4cc3841006819dfefe6f0735b4f120f8d4f8f8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Thu, 8 Jun 2023 20:44:46 +0200 -Subject: [PATCH] bootstrap: Add --(no-)system-cppdap configuration switch. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Björn Esser ---- - bootstrap | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/bootstrap b/bootstrap -index 109e450548..cc604256d8 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -667,6 +667,8 @@ Configuration: - (for use only by package maintainers) - --no-system-libs use all cmake-provided third-party libraries - (default) -+ --system-cppdap use system-installed cppdap library -+ --no-system-cppdap use cmake-provided cppdap library (default) - --system-curl use system-installed curl library - --no-system-curl use cmake-provided curl library (default) - --system-expat use system-installed expat library -@@ -954,10 +956,10 @@ while test $# != 0; do - --init=*) cmake_init_file=`cmake_arg "$1"` ;; - --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;; - --no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;; -- --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-nghttp2|--system-zstd|--system-libuv) -+ --system-bzip2|--system-cppdap|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-librhash|--system-zlib|--system-liblzma|--system-nghttp2|--system-zstd|--system-libuv) - lib=`cmake_arg "$1" "--system-"` - cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;; -- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-nghttp2|--no-system-zstd|--no-system-libuv) -+ --no-system-bzip2|--no-system-cppdap|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-librhash|--no-system-zlib|--no-system-liblzma|--no-system-nghttp2|--no-system-zstd|--no-system-libuv) - lib=`cmake_arg "$1" "--no-system-"` - cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;; - --bootstrap-system-libuv) bootstrap_system_libuv="1" ;; --- -2.40.1 - diff --git a/cmake.spec b/cmake.spec index 2f9eee5..d7523c9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global baserelease 1 # Set to RC version if building RC, else comment out. -%global rcsuf rc1 +%global rcsuf rc2 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -114,8 +114,6 @@ Source5: %{name}.req # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch -# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8550 -Patch101: 0001-bootstrap-Add-no-system-cppdap-configuration-switch.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -555,6 +553,9 @@ popd %changelog +* Mon Jun 12 2023 Björn Esser - 3.27.0~rc2-1 +- cmake-3.27.0-rc2 + * Thu Jun 08 2023 Björn Esser - 3.27.0~rc1-1 - cmake-3.27.0-rc1 - Use CMake-provided cppdap diff --git a/sources b/sources index e62f032..e9a3244 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.0-rc1.tar.gz) = 02ea3ed06ccc339980235371de0b3c823f92cdd46bc4de3b0bb5788cd1265c292e70dd824d2fd3740ec67fa63a5e2a903a32735f6073d8843465e300ccef5e6d +SHA512 (cmake-3.27.0-rc2.tar.gz) = c354caac080510d779c112f5301a6158d42157e518176b63d1784fbbf3a19fe0f62028f1d5e4b4f227002e9c3b4309c31826024ea9b2d6e130d5db9bcec6e9d8 From 4065822b5e5685e1ac83e7c1ec154ea6ba35c7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 19 Jun 2023 21:23:30 +0200 Subject: [PATCH 155/238] Backport some upstream patches which will be included in rc3 --- ...-Fix-flake8-E124-diagnostic-in-cmake.patch | 29 +++++++ ...-Restore-explicit-check-for-Sphinx-2.patch | 60 +++++++++++++ ...XECUTABLE-early-enough-to-use-in-all.patch | 44 ++++++++++ ...-git-to-enable-RunCMake.CMP0150-test.patch | 36 ++++++++ ...lease-note-for-TARGET_RUNTIME_DLL_DI.patch | 35 ++++++++ ...ties-Sphinx-Don-t-ignore-flake8-E402.patch | 80 +++++++++++++++++ ...lities-Sphinx-Fix-some-flake8-gripes.patch | 67 +++++++++++++++ ...literal-include-to-contain-full-code.patch | 33 +++++++ ...ostgreSQL-Add-support-for-version-15.patch | 38 ++++++++ 0010-list-restore-SUBLIST-behavior.patch | 86 +++++++++++++++++++ cmake.spec | 17 +++- 11 files changed, 524 insertions(+), 1 deletion(-) create mode 100644 0001-Utilities-Sphinx-Fix-flake8-E124-diagnostic-in-cmake.patch create mode 100644 0002-Utilities-Sphinx-Restore-explicit-check-for-Sphinx-2.patch create mode 100644 0003-Tests-Find-GIT_EXECUTABLE-early-enough-to-use-in-all.patch create mode 100644 0004-Tests-Require-git-to-enable-RunCMake.CMP0150-test.patch create mode 100644 0005-Help-Add-3.27-release-note-for-TARGET_RUNTIME_DLL_DI.patch create mode 100644 0006-Utilities-Sphinx-Don-t-ignore-flake8-E402.patch create mode 100644 0007-Utilities-Sphinx-Fix-some-flake8-gripes.patch create mode 100644 0008-Tutorial-Extend-literal-include-to-contain-full-code.patch create mode 100644 0009-FindPostgreSQL-Add-support-for-version-15.patch create mode 100644 0010-list-restore-SUBLIST-behavior.patch diff --git a/0001-Utilities-Sphinx-Fix-flake8-E124-diagnostic-in-cmake.patch b/0001-Utilities-Sphinx-Fix-flake8-E124-diagnostic-in-cmake.patch new file mode 100644 index 0000000..e39f550 --- /dev/null +++ b/0001-Utilities-Sphinx-Fix-flake8-E124-diagnostic-in-cmake.patch @@ -0,0 +1,29 @@ +From 5de805bea21af6c20f35afcbb925b1856d643bbe Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Mon, 12 Jun 2023 17:33:59 -0400 +Subject: [PATCH 1/9] Utilities/Sphinx: Fix flake8 E124 diagnostic in cmake.py +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Björn Esser +--- + Utilities/Sphinx/cmake.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py +index ffef5b36a2..faca2eda7f 100644 +--- a/Utilities/Sphinx/cmake.py ++++ b/Utilities/Sphinx/cmake.py +@@ -514,7 +514,7 @@ class CMakeReferenceRole: + class Class(parent): + def __call__(self, name: str, rawtext: str, text: str, + *args, **kwargs +- ) -> Tuple[List[Node], List[system_message]]: ++ ) -> Tuple[List[Node], List[system_message]]: + text = CMakeReferenceRole._escape_angle_brackets(text) + return super().__call__(name, rawtext, text, *args, **kwargs) + return Class +-- +2.41.0 + diff --git a/0002-Utilities-Sphinx-Restore-explicit-check-for-Sphinx-2.patch b/0002-Utilities-Sphinx-Restore-explicit-check-for-Sphinx-2.patch new file mode 100644 index 0000000..5117772 --- /dev/null +++ b/0002-Utilities-Sphinx-Restore-explicit-check-for-Sphinx-2.patch @@ -0,0 +1,60 @@ +From 1f39a3cd1a5b397d26cb9dfa1242573c1ee45143 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Mon, 12 Jun 2023 17:37:13 -0400 +Subject: [PATCH 2/9] Utilities/Sphinx: Restore explicit check for Sphinx 2.x + or later +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Refactoring in commit adbc8c982d (Utilities/Sphinx: Fix flake8 gripes in +cmake.py, 2023-03-13, v3.27.0-rc1~317^2) moved the assertion added by +commit cef51925a4 (Utilities/Sphinx: Require Sphinx 2.x or later, +2023-03-13, v3.27.0-rc1~317^2~2) to after imports, which is too late to +clearly reject older Sphinx versions. + +Signed-off-by: Björn Esser +--- + Utilities/Sphinx/.flake8 | 3 +++ + Utilities/Sphinx/cmake.py | 8 +++++--- + 2 files changed, 8 insertions(+), 3 deletions(-) + create mode 100644 Utilities/Sphinx/.flake8 + +diff --git a/Utilities/Sphinx/.flake8 b/Utilities/Sphinx/.flake8 +new file mode 100644 +index 0000000000..7218008fed +--- /dev/null ++++ b/Utilities/Sphinx/.flake8 +@@ -0,0 +1,3 @@ ++[flake8] ++per-file-ignores = ++ cmake.py: E402 +diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py +index faca2eda7f..d3eb94814c 100644 +--- a/Utilities/Sphinx/cmake.py ++++ b/Utilities/Sphinx/cmake.py +@@ -11,6 +11,11 @@ from typing import Any, List, Tuple, Type, cast + + import sphinx + ++# Require at least Sphinx 2.x. ++# flake8 issues E402 for imports after this, but the purpose of this ++# check is to fail more clearly if the imports below will fail. ++assert sphinx.version_info >= (2,) ++ + from docutils.utils.code_analyzer import Lexer, LexerError + from docutils.parsers.rst import Directive, directives + from docutils.transforms import Transform +@@ -110,9 +115,6 @@ CMakeLexer.tokens["root"] = [ + + # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +-# Require at least Sphinx 2.x. +-assert sphinx.version_info >= (2,) +- + logger = logging.getLogger(__name__) + + # RE to split multiple command signatures. +-- +2.41.0 + diff --git a/0003-Tests-Find-GIT_EXECUTABLE-early-enough-to-use-in-all.patch b/0003-Tests-Find-GIT_EXECUTABLE-early-enough-to-use-in-all.patch new file mode 100644 index 0000000..aae107b --- /dev/null +++ b/0003-Tests-Find-GIT_EXECUTABLE-early-enough-to-use-in-all.patch @@ -0,0 +1,44 @@ +From 0c2610bd300218165e72524b87e998fd06d86ef5 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Mon, 12 Jun 2023 17:53:20 -0400 +Subject: [PATCH 3/9] Tests: Find GIT_EXECUTABLE early enough to use in all + tests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some tests work only if a `git` executable is available. + +Signed-off-by: Björn Esser +--- + Tests/CMakeLists.txt | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt +index 5ef77fda62..53bb1e654b 100644 +--- a/Tests/CMakeLists.txt ++++ b/Tests/CMakeLists.txt +@@ -142,6 +142,9 @@ if(BUILD_TESTING) + ) + endif() + ++ # Look for git to use for tests. ++ find_program(GIT_EXECUTABLE NAMES git) ++ + # Look for rpmbuild to use for tests. + # The tool does not work with spaces in the path. + if(NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ") +@@ -2688,10 +2691,6 @@ if(BUILD_TESTING) + endif() + + # Test CTest Update with GIT +- if(NOT DEFINED CMake_TEST_CTestUpdate_GIT OR CMake_TEST_CTestUpdate_GIT) +- find_program(GIT_EXECUTABLE NAMES git) +- mark_as_advanced(GIT_EXECUTABLE) +- endif() + if(NOT DEFINED CMake_TEST_CTestUpdate_GIT AND GIT_EXECUTABLE + AND (UNIX OR NOT "${GIT_EXECUTABLE}" MATCHES "cygwin")) + set(CMake_TEST_CTestUpdate_GIT 1) +-- +2.41.0 + diff --git a/0004-Tests-Require-git-to-enable-RunCMake.CMP0150-test.patch b/0004-Tests-Require-git-to-enable-RunCMake.CMP0150-test.patch new file mode 100644 index 0000000..a49c3e2 --- /dev/null +++ b/0004-Tests-Require-git-to-enable-RunCMake.CMP0150-test.patch @@ -0,0 +1,36 @@ +From 15d9d591bd8560284ec8b82b022ba0135ae58f82 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Mon, 12 Jun 2023 17:56:53 -0400 +Subject: [PATCH 4/9] Tests: Require git to enable RunCMake.CMP0150 test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The test added by commit 550f63447d (ExternalProject/FetchContent: +Support relative remote URLs, 2023-04-21, v3.27.0-rc1~156^2) covers +Git-specific functionality, and requires a `git` tool to be available. + +Signed-off-by: Björn Esser +--- + Tests/RunCMake/CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt +index d4f3341a15..f089a963cd 100644 +--- a/Tests/RunCMake/CMakeLists.txt ++++ b/Tests/RunCMake/CMakeLists.txt +@@ -160,7 +160,10 @@ endif() + add_RunCMake_test(CMP0132) + add_RunCMake_test(CMP0135) + add_RunCMake_test(CMP0139) +-add_RunCMake_test(CMP0150) ++ ++if(GIT_EXECUTABLE) ++ add_RunCMake_test(CMP0150) ++endif() + + # The test for Policy 65 requires the use of the + # CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS variable, which both the VS and Xcode +-- +2.41.0 + diff --git a/0005-Help-Add-3.27-release-note-for-TARGET_RUNTIME_DLL_DI.patch b/0005-Help-Add-3.27-release-note-for-TARGET_RUNTIME_DLL_DI.patch new file mode 100644 index 0000000..640283c --- /dev/null +++ b/0005-Help-Add-3.27-release-note-for-TARGET_RUNTIME_DLL_DI.patch @@ -0,0 +1,35 @@ +From acce355673b97cdf2d6841fddb338a6ab2eeaa43 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Tue, 13 Jun 2023 10:57:09 -0400 +Subject: [PATCH 5/9] Help: Add 3.27 release note for TARGET_RUNTIME_DLL_DIRS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This was accidentally left out of commit 2ce3d62ffb (Help: add +documentation for the new TARGET_RUNTIME_DLL_DIRS genex, 2023-02-26, +v3.27.0-rc1~400^2~2). + +Signed-off-by: Björn Esser +--- + Help/release/3.27.rst | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Help/release/3.27.rst b/Help/release/3.27.rst +index dadd7a60a6..930a0dc13c 100644 +--- a/Help/release/3.27.rst ++++ b/Help/release/3.27.rst +@@ -157,6 +157,10 @@ Generator Expressions + :ref:`transformation ` operations learned + to process :ref:`lists ` of paths element-wise. + ++* The :genex:`TARGET_RUNTIME_DLL_DIRS` generator expression was added. ++ It expands to a list of the directories containing DLLs in ++ :genex:`TARGET_RUNTIME_DLLS`. ++ + Autogen + ------- + +-- +2.41.0 + diff --git a/0006-Utilities-Sphinx-Don-t-ignore-flake8-E402.patch b/0006-Utilities-Sphinx-Don-t-ignore-flake8-E402.patch new file mode 100644 index 0000000..7895532 --- /dev/null +++ b/0006-Utilities-Sphinx-Don-t-ignore-flake8-E402.patch @@ -0,0 +1,80 @@ +From 4bd1beded48dfa5150f13ed81df15035bce000d3 Mon Sep 17 00:00:00 2001 +From: Matthew Woehlke +Date: Tue, 13 Jun 2023 11:25:14 -0400 +Subject: [PATCH 6/9] Utilities/Sphinx: Don't ignore flake8 E402 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Refactor commit 1f39a3cd1a (Utilities/Sphinx: Restore explicit check for +Sphinx 2.x or later) to avoid needing to suppress flake8 E402. While +ignoring it with respect to the docutils/sphinx imports and the sphinx +version check was correct, the need to disable it for the whole file was +suboptimal. + +Signed-off-by: Björn Esser +--- + Utilities/Sphinx/.flake8 | 3 --- + Utilities/Sphinx/cmake.py | 36 ++++++++++++++++++------------------ + 2 files changed, 18 insertions(+), 21 deletions(-) + delete mode 100644 Utilities/Sphinx/.flake8 + +diff --git a/Utilities/Sphinx/.flake8 b/Utilities/Sphinx/.flake8 +deleted file mode 100644 +index 7218008fed..0000000000 +--- a/Utilities/Sphinx/.flake8 ++++ /dev/null +@@ -1,3 +0,0 @@ +-[flake8] +-per-file-ignores = +- cmake.py: E402 +diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py +index d3eb94814c..e6c2266938 100644 +--- a/Utilities/Sphinx/cmake.py ++++ b/Utilities/Sphinx/cmake.py +@@ -11,24 +11,24 @@ from typing import Any, List, Tuple, Type, cast + + import sphinx + +-# Require at least Sphinx 2.x. +-# flake8 issues E402 for imports after this, but the purpose of this +-# check is to fail more clearly if the imports below will fail. +-assert sphinx.version_info >= (2,) +- +-from docutils.utils.code_analyzer import Lexer, LexerError +-from docutils.parsers.rst import Directive, directives +-from docutils.transforms import Transform +-from docutils.nodes import Element, Node, TextElement, system_message +-from docutils import io, nodes +- +-from sphinx.directives import ObjectDescription, nl_escape_re +-from sphinx.domains import Domain, ObjType +-from sphinx.roles import XRefRole +-from sphinx.util.docutils import ReferenceRole +-from sphinx.util.nodes import make_refnode +-from sphinx.util import logging, ws_re +-from sphinx import addnodes ++# The following imports may fail if we don't have Sphinx 2.x or later. ++if sphinx.version_info >= (2,): ++ from docutils.utils.code_analyzer import Lexer, LexerError ++ from docutils.parsers.rst import Directive, directives ++ from docutils.transforms import Transform ++ from docutils.nodes import Element, Node, TextElement, system_message ++ from docutils import io, nodes ++ ++ from sphinx.directives import ObjectDescription, nl_escape_re ++ from sphinx.domains import Domain, ObjType ++ from sphinx.roles import XRefRole ++ from sphinx.util.docutils import ReferenceRole ++ from sphinx.util.nodes import make_refnode ++ from sphinx.util import logging, ws_re ++ from sphinx import addnodes ++else: ++ # Sphinx 2.x is required. ++ assert sphinx.version_info >= (2,) + + # END imports + +-- +2.41.0 + diff --git a/0007-Utilities-Sphinx-Fix-some-flake8-gripes.patch b/0007-Utilities-Sphinx-Fix-some-flake8-gripes.patch new file mode 100644 index 0000000..5110241 --- /dev/null +++ b/0007-Utilities-Sphinx-Fix-some-flake8-gripes.patch @@ -0,0 +1,67 @@ +From 528cdc75519987a2004db94d1e7b0e445b1fb158 Mon Sep 17 00:00:00 2001 +From: Matthew Woehlke +Date: Tue, 13 Jun 2023 11:39:48 -0400 +Subject: [PATCH 7/9] Utilities/Sphinx: Fix some flake8 gripes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reorder some imports to better conform to what flake8 wants. + +Signed-off-by: Björn Esser +--- + Utilities/Sphinx/cmake.py | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py +index e6c2266938..0afd705a9e 100644 +--- a/Utilities/Sphinx/cmake.py ++++ b/Utilities/Sphinx/cmake.py +@@ -5,7 +5,6 @@ + + import os + import re +- + from dataclasses import dataclass + from typing import Any, List, Tuple, Type, cast + +@@ -13,19 +12,19 @@ import sphinx + + # The following imports may fail if we don't have Sphinx 2.x or later. + if sphinx.version_info >= (2,): +- from docutils.utils.code_analyzer import Lexer, LexerError ++ from docutils import io, nodes ++ from docutils.nodes import Element, Node, TextElement, system_message + from docutils.parsers.rst import Directive, directives + from docutils.transforms import Transform +- from docutils.nodes import Element, Node, TextElement, system_message +- from docutils import io, nodes ++ from docutils.utils.code_analyzer import Lexer, LexerError + ++ from sphinx import addnodes + from sphinx.directives import ObjectDescription, nl_escape_re + from sphinx.domains import Domain, ObjType + from sphinx.roles import XRefRole ++ from sphinx.util import logging, ws_re + from sphinx.util.docutils import ReferenceRole + from sphinx.util.nodes import make_refnode +- from sphinx.util import logging, ws_re +- from sphinx import addnodes + else: + # Sphinx 2.x is required. + assert sphinx.version_info >= (2,) +@@ -47,10 +46,10 @@ else: + # - manual/cmake-buildsystem.7.html + # (with nested $<..>; relative and absolute paths, "::") + ++from pygments.lexer import bygroups # noqa I100 + from pygments.lexers import CMakeLexer + from pygments.token import (Comment, Name, Number, Operator, Punctuation, + String, Text, Whitespace) +-from pygments.lexer import bygroups + + # Notes on regular expressions below: + # - [\.\+-] are needed for string constants like gtk+-2.0 +-- +2.41.0 + diff --git a/0008-Tutorial-Extend-literal-include-to-contain-full-code.patch b/0008-Tutorial-Extend-literal-include-to-contain-full-code.patch new file mode 100644 index 0000000..ccdbdb9 --- /dev/null +++ b/0008-Tutorial-Extend-literal-include-to-contain-full-code.patch @@ -0,0 +1,33 @@ +From a8679c997d05dffda9f0e892221da244177ee502 Mon Sep 17 00:00:00 2001 +From: Markus Ferrell +Date: Wed, 14 Jun 2023 19:34:41 -0400 +Subject: [PATCH 8/9] Tutorial: Extend literal include to contain full code + changes in solution +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The solution for step 7 todo 5 did not include all of the code changes. +Modify it to include the needed `#endif` code change. + +Signed-off-by: Björn Esser +--- + Help/guide/tutorial/Adding System Introspection.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Help/guide/tutorial/Adding System Introspection.rst b/Help/guide/tutorial/Adding System Introspection.rst +index b3147736a3..117b2306d9 100644 +--- a/Help/guide/tutorial/Adding System Introspection.rst ++++ b/Help/guide/tutorial/Adding System Introspection.rst +@@ -156,7 +156,7 @@ compute the square root in the ``mysqrt`` function. The ``mysqrt`` function in + :name: MathFunctions/mysqrt.cxx-ifdef + :language: c++ + :start-after: // if we have both log and exp then use them +- :end-before: // do ten iterations ++ :end-before: return result; + + .. raw:: html + +-- +2.41.0 + diff --git a/0009-FindPostgreSQL-Add-support-for-version-15.patch b/0009-FindPostgreSQL-Add-support-for-version-15.patch new file mode 100644 index 0000000..0be05d5 --- /dev/null +++ b/0009-FindPostgreSQL-Add-support-for-version-15.patch @@ -0,0 +1,38 @@ +From 80ba2cccfc32f4c317a1a4d715344ee602f976e8 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Mon, 12 Jun 2023 11:13:15 -0400 +Subject: [PATCH 9/9] FindPostgreSQL: Add support for version 15 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Björn Esser +--- + Modules/FindPostgreSQL.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake +index c92fbdcd22..6e970e8432 100644 +--- a/Modules/FindPostgreSQL.cmake ++++ b/Modules/FindPostgreSQL.cmake +@@ -53,7 +53,7 @@ is set regardless of the presence of the ``Server`` component in find_package ca + # In Windows the default installation of PostgreSQL uses that as part of the path. + # E.g C:\Program Files\PostgreSQL\8.4. + # Currently, the following version numbers are known to this module: +-# "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0" ++# "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0" + # + # To use this variable just do something like this: + # set(PostgreSQL_ADDITIONAL_VERSIONS "9.2" "8.4.4") +@@ -102,7 +102,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher + + + set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} +- "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") ++ "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") + + # Define additional search paths for root directories. + set( PostgreSQL_ROOT_DIRECTORIES +-- +2.41.0 + diff --git a/0010-list-restore-SUBLIST-behavior.patch b/0010-list-restore-SUBLIST-behavior.patch new file mode 100644 index 0000000..10968d9 --- /dev/null +++ b/0010-list-restore-SUBLIST-behavior.patch @@ -0,0 +1,86 @@ +From 1cfaed0684e7e26687a3a0a607925456dc656c57 Mon Sep 17 00:00:00 2001 +From: Marc Chevrier +Date: Fri, 16 Jun 2023 15:09:57 +0200 +Subject: [PATCH] list(): restore SUBLIST behavior + +Fixes: #25002 +--- + Source/cmList.h | 2 +- + Tests/RunCMake/list/SUBLIST.cmake | 51 +++++++++++++++++++++++++++++++ + 2 files changed, 52 insertions(+), 1 deletion(-) + +diff --git a/Source/cmList.h b/Source/cmList.h +index d9ce9510c6b..eba0400c934 100644 +--- a/Source/cmList.h ++++ b/Source/cmList.h +@@ -322,7 +322,7 @@ public: + // extract sublist in range [first, last) + cmList sublist(const_iterator first, const_iterator last) const + { +- return cmList{ first, last }; ++ return cmList{ first, last, ExpandElements::No, EmptyElements::Yes }; + } + // Extract sublist in range [first, last) + // Throw std::out_of_range if pos is invalid +diff --git a/Tests/RunCMake/list/SUBLIST.cmake b/Tests/RunCMake/list/SUBLIST.cmake +index fd15c28447d..6a33addc846 100644 +--- a/Tests/RunCMake/list/SUBLIST.cmake ++++ b/Tests/RunCMake/list/SUBLIST.cmake +@@ -44,3 +44,54 @@ list(SUBLIST mylist 1 -1 result) + if (NOT result STREQUAL "bravo;charlie;delta") + message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"bravo;charlie;delta\"") + endif() ++ ++ ++set(mylist ";;") ++ ++unset(result) ++list(SUBLIST mylist 0 0 result) ++ ++if (NOT result STREQUAL "") ++ message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"\"") ++endif() ++ ++unset(result) ++list(SUBLIST mylist 0 1 result) ++ ++if (NOT result STREQUAL "") ++ message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"\"") ++endif() ++ ++unset(result) ++list(SUBLIST mylist 0 2 result) ++ ++if (NOT result STREQUAL ";") ++ message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \";\"") ++endif() ++ ++unset(result) ++list(SUBLIST mylist 0 3 result) ++ ++if (NOT result STREQUAL ";;") ++ message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \";;\"") ++endif() ++ ++ ++set(mylist [[a\;b;c\;d;e]]) ++ ++unset(result) ++list(SUBLIST mylist 1 2 result) ++ ++if (NOT result STREQUAL "c;d;e") ++ message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"c;d;e\"") ++endif() ++ ++ ++set(mylist [[a\;b;c\\;d;e;f;g;h]]) ++ ++unset(result) ++list(SUBLIST mylist 1 -1 result) ++ ++if (NOT result STREQUAL "c\\;d;e;f;g;h") ++ message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"c\\;d;e;f;g;h\"") ++endif() +-- +GitLab + diff --git a/cmake.spec b/cmake.spec index d7523c9..7517b85 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. %global rcsuf rc2 @@ -115,6 +115,18 @@ Source5: %{name}.req # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch +# Upstream +Patch1001: 0001-Utilities-Sphinx-Fix-flake8-E124-diagnostic-in-cmake.patch +Patch1002: 0002-Utilities-Sphinx-Restore-explicit-check-for-Sphinx-2.patch +Patch1003: 0003-Tests-Find-GIT_EXECUTABLE-early-enough-to-use-in-all.patch +Patch1004: 0004-Tests-Require-git-to-enable-RunCMake.CMP0150-test.patch +Patch1005: 0005-Help-Add-3.27-release-note-for-TARGET_RUNTIME_DLL_DI.patch +Patch1006: 0006-Utilities-Sphinx-Don-t-ignore-flake8-E402.patch +Patch1007: 0007-Utilities-Sphinx-Fix-some-flake8-gripes.patch +Patch1008: 0008-Tutorial-Extend-literal-include-to-contain-full-code.patch +Patch1009: 0009-FindPostgreSQL-Add-support-for-version-15.patch +Patch1010: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8569.patch#/0010-list-restore-SUBLIST-behavior.patch + # Patch for renaming on EPEL %if 0%{?name_suffix:1} Patch1: %{name}-rename.patch @@ -553,6 +565,9 @@ popd %changelog +* Mon Jun 19 2023 Björn Esser - 3.27.0~rc2-2 +- Backport some upstream patches which will be included in rc3 + * Mon Jun 12 2023 Björn Esser - 3.27.0~rc2-1 - cmake-3.27.0-rc2 From ed8f42b443408d982f2077eac63cd5f3498b7e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 20 Jun 2023 21:04:28 +0200 Subject: [PATCH 156/238] cmake-3.27.0-rc3 Fixes rhbz#2214407 --- ...-Fix-flake8-E124-diagnostic-in-cmake.patch | 29 ------- ...-Restore-explicit-check-for-Sphinx-2.patch | 60 ------------- ...XECUTABLE-early-enough-to-use-in-all.patch | 44 ---------- ...-git-to-enable-RunCMake.CMP0150-test.patch | 36 -------- ...lease-note-for-TARGET_RUNTIME_DLL_DI.patch | 35 -------- ...ties-Sphinx-Don-t-ignore-flake8-E402.patch | 80 ----------------- ...lities-Sphinx-Fix-some-flake8-gripes.patch | 67 --------------- ...literal-include-to-contain-full-code.patch | 33 ------- ...ostgreSQL-Add-support-for-version-15.patch | 38 -------- 0010-list-restore-SUBLIST-behavior.patch | 86 ------------------- cmake.spec | 20 ++--- sources | 2 +- 12 files changed, 7 insertions(+), 523 deletions(-) delete mode 100644 0001-Utilities-Sphinx-Fix-flake8-E124-diagnostic-in-cmake.patch delete mode 100644 0002-Utilities-Sphinx-Restore-explicit-check-for-Sphinx-2.patch delete mode 100644 0003-Tests-Find-GIT_EXECUTABLE-early-enough-to-use-in-all.patch delete mode 100644 0004-Tests-Require-git-to-enable-RunCMake.CMP0150-test.patch delete mode 100644 0005-Help-Add-3.27-release-note-for-TARGET_RUNTIME_DLL_DI.patch delete mode 100644 0006-Utilities-Sphinx-Don-t-ignore-flake8-E402.patch delete mode 100644 0007-Utilities-Sphinx-Fix-some-flake8-gripes.patch delete mode 100644 0008-Tutorial-Extend-literal-include-to-contain-full-code.patch delete mode 100644 0009-FindPostgreSQL-Add-support-for-version-15.patch delete mode 100644 0010-list-restore-SUBLIST-behavior.patch diff --git a/0001-Utilities-Sphinx-Fix-flake8-E124-diagnostic-in-cmake.patch b/0001-Utilities-Sphinx-Fix-flake8-E124-diagnostic-in-cmake.patch deleted file mode 100644 index e39f550..0000000 --- a/0001-Utilities-Sphinx-Fix-flake8-E124-diagnostic-in-cmake.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5de805bea21af6c20f35afcbb925b1856d643bbe Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Mon, 12 Jun 2023 17:33:59 -0400 -Subject: [PATCH 1/9] Utilities/Sphinx: Fix flake8 E124 diagnostic in cmake.py -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Björn Esser ---- - Utilities/Sphinx/cmake.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py -index ffef5b36a2..faca2eda7f 100644 ---- a/Utilities/Sphinx/cmake.py -+++ b/Utilities/Sphinx/cmake.py -@@ -514,7 +514,7 @@ class CMakeReferenceRole: - class Class(parent): - def __call__(self, name: str, rawtext: str, text: str, - *args, **kwargs -- ) -> Tuple[List[Node], List[system_message]]: -+ ) -> Tuple[List[Node], List[system_message]]: - text = CMakeReferenceRole._escape_angle_brackets(text) - return super().__call__(name, rawtext, text, *args, **kwargs) - return Class --- -2.41.0 - diff --git a/0002-Utilities-Sphinx-Restore-explicit-check-for-Sphinx-2.patch b/0002-Utilities-Sphinx-Restore-explicit-check-for-Sphinx-2.patch deleted file mode 100644 index 5117772..0000000 --- a/0002-Utilities-Sphinx-Restore-explicit-check-for-Sphinx-2.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1f39a3cd1a5b397d26cb9dfa1242573c1ee45143 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Mon, 12 Jun 2023 17:37:13 -0400 -Subject: [PATCH 2/9] Utilities/Sphinx: Restore explicit check for Sphinx 2.x - or later -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Refactoring in commit adbc8c982d (Utilities/Sphinx: Fix flake8 gripes in -cmake.py, 2023-03-13, v3.27.0-rc1~317^2) moved the assertion added by -commit cef51925a4 (Utilities/Sphinx: Require Sphinx 2.x or later, -2023-03-13, v3.27.0-rc1~317^2~2) to after imports, which is too late to -clearly reject older Sphinx versions. - -Signed-off-by: Björn Esser ---- - Utilities/Sphinx/.flake8 | 3 +++ - Utilities/Sphinx/cmake.py | 8 +++++--- - 2 files changed, 8 insertions(+), 3 deletions(-) - create mode 100644 Utilities/Sphinx/.flake8 - -diff --git a/Utilities/Sphinx/.flake8 b/Utilities/Sphinx/.flake8 -new file mode 100644 -index 0000000000..7218008fed ---- /dev/null -+++ b/Utilities/Sphinx/.flake8 -@@ -0,0 +1,3 @@ -+[flake8] -+per-file-ignores = -+ cmake.py: E402 -diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py -index faca2eda7f..d3eb94814c 100644 ---- a/Utilities/Sphinx/cmake.py -+++ b/Utilities/Sphinx/cmake.py -@@ -11,6 +11,11 @@ from typing import Any, List, Tuple, Type, cast - - import sphinx - -+# Require at least Sphinx 2.x. -+# flake8 issues E402 for imports after this, but the purpose of this -+# check is to fail more clearly if the imports below will fail. -+assert sphinx.version_info >= (2,) -+ - from docutils.utils.code_analyzer import Lexer, LexerError - from docutils.parsers.rst import Directive, directives - from docutils.transforms import Transform -@@ -110,9 +115,6 @@ CMakeLexer.tokens["root"] = [ - - # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - --# Require at least Sphinx 2.x. --assert sphinx.version_info >= (2,) -- - logger = logging.getLogger(__name__) - - # RE to split multiple command signatures. --- -2.41.0 - diff --git a/0003-Tests-Find-GIT_EXECUTABLE-early-enough-to-use-in-all.patch b/0003-Tests-Find-GIT_EXECUTABLE-early-enough-to-use-in-all.patch deleted file mode 100644 index aae107b..0000000 --- a/0003-Tests-Find-GIT_EXECUTABLE-early-enough-to-use-in-all.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0c2610bd300218165e72524b87e998fd06d86ef5 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Mon, 12 Jun 2023 17:53:20 -0400 -Subject: [PATCH 3/9] Tests: Find GIT_EXECUTABLE early enough to use in all - tests -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some tests work only if a `git` executable is available. - -Signed-off-by: Björn Esser ---- - Tests/CMakeLists.txt | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt -index 5ef77fda62..53bb1e654b 100644 ---- a/Tests/CMakeLists.txt -+++ b/Tests/CMakeLists.txt -@@ -142,6 +142,9 @@ if(BUILD_TESTING) - ) - endif() - -+ # Look for git to use for tests. -+ find_program(GIT_EXECUTABLE NAMES git) -+ - # Look for rpmbuild to use for tests. - # The tool does not work with spaces in the path. - if(NOT CMAKE_CURRENT_BINARY_DIR MATCHES " ") -@@ -2688,10 +2691,6 @@ if(BUILD_TESTING) - endif() - - # Test CTest Update with GIT -- if(NOT DEFINED CMake_TEST_CTestUpdate_GIT OR CMake_TEST_CTestUpdate_GIT) -- find_program(GIT_EXECUTABLE NAMES git) -- mark_as_advanced(GIT_EXECUTABLE) -- endif() - if(NOT DEFINED CMake_TEST_CTestUpdate_GIT AND GIT_EXECUTABLE - AND (UNIX OR NOT "${GIT_EXECUTABLE}" MATCHES "cygwin")) - set(CMake_TEST_CTestUpdate_GIT 1) --- -2.41.0 - diff --git a/0004-Tests-Require-git-to-enable-RunCMake.CMP0150-test.patch b/0004-Tests-Require-git-to-enable-RunCMake.CMP0150-test.patch deleted file mode 100644 index a49c3e2..0000000 --- a/0004-Tests-Require-git-to-enable-RunCMake.CMP0150-test.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 15d9d591bd8560284ec8b82b022ba0135ae58f82 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Mon, 12 Jun 2023 17:56:53 -0400 -Subject: [PATCH 4/9] Tests: Require git to enable RunCMake.CMP0150 test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The test added by commit 550f63447d (ExternalProject/FetchContent: -Support relative remote URLs, 2023-04-21, v3.27.0-rc1~156^2) covers -Git-specific functionality, and requires a `git` tool to be available. - -Signed-off-by: Björn Esser ---- - Tests/RunCMake/CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt -index d4f3341a15..f089a963cd 100644 ---- a/Tests/RunCMake/CMakeLists.txt -+++ b/Tests/RunCMake/CMakeLists.txt -@@ -160,7 +160,10 @@ endif() - add_RunCMake_test(CMP0132) - add_RunCMake_test(CMP0135) - add_RunCMake_test(CMP0139) --add_RunCMake_test(CMP0150) -+ -+if(GIT_EXECUTABLE) -+ add_RunCMake_test(CMP0150) -+endif() - - # The test for Policy 65 requires the use of the - # CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS variable, which both the VS and Xcode --- -2.41.0 - diff --git a/0005-Help-Add-3.27-release-note-for-TARGET_RUNTIME_DLL_DI.patch b/0005-Help-Add-3.27-release-note-for-TARGET_RUNTIME_DLL_DI.patch deleted file mode 100644 index 640283c..0000000 --- a/0005-Help-Add-3.27-release-note-for-TARGET_RUNTIME_DLL_DI.patch +++ /dev/null @@ -1,35 +0,0 @@ -From acce355673b97cdf2d6841fddb338a6ab2eeaa43 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Tue, 13 Jun 2023 10:57:09 -0400 -Subject: [PATCH 5/9] Help: Add 3.27 release note for TARGET_RUNTIME_DLL_DIRS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This was accidentally left out of commit 2ce3d62ffb (Help: add -documentation for the new TARGET_RUNTIME_DLL_DIRS genex, 2023-02-26, -v3.27.0-rc1~400^2~2). - -Signed-off-by: Björn Esser ---- - Help/release/3.27.rst | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Help/release/3.27.rst b/Help/release/3.27.rst -index dadd7a60a6..930a0dc13c 100644 ---- a/Help/release/3.27.rst -+++ b/Help/release/3.27.rst -@@ -157,6 +157,10 @@ Generator Expressions - :ref:`transformation ` operations learned - to process :ref:`lists ` of paths element-wise. - -+* The :genex:`TARGET_RUNTIME_DLL_DIRS` generator expression was added. -+ It expands to a list of the directories containing DLLs in -+ :genex:`TARGET_RUNTIME_DLLS`. -+ - Autogen - ------- - --- -2.41.0 - diff --git a/0006-Utilities-Sphinx-Don-t-ignore-flake8-E402.patch b/0006-Utilities-Sphinx-Don-t-ignore-flake8-E402.patch deleted file mode 100644 index 7895532..0000000 --- a/0006-Utilities-Sphinx-Don-t-ignore-flake8-E402.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 4bd1beded48dfa5150f13ed81df15035bce000d3 Mon Sep 17 00:00:00 2001 -From: Matthew Woehlke -Date: Tue, 13 Jun 2023 11:25:14 -0400 -Subject: [PATCH 6/9] Utilities/Sphinx: Don't ignore flake8 E402 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Refactor commit 1f39a3cd1a (Utilities/Sphinx: Restore explicit check for -Sphinx 2.x or later) to avoid needing to suppress flake8 E402. While -ignoring it with respect to the docutils/sphinx imports and the sphinx -version check was correct, the need to disable it for the whole file was -suboptimal. - -Signed-off-by: Björn Esser ---- - Utilities/Sphinx/.flake8 | 3 --- - Utilities/Sphinx/cmake.py | 36 ++++++++++++++++++------------------ - 2 files changed, 18 insertions(+), 21 deletions(-) - delete mode 100644 Utilities/Sphinx/.flake8 - -diff --git a/Utilities/Sphinx/.flake8 b/Utilities/Sphinx/.flake8 -deleted file mode 100644 -index 7218008fed..0000000000 ---- a/Utilities/Sphinx/.flake8 -+++ /dev/null -@@ -1,3 +0,0 @@ --[flake8] --per-file-ignores = -- cmake.py: E402 -diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py -index d3eb94814c..e6c2266938 100644 ---- a/Utilities/Sphinx/cmake.py -+++ b/Utilities/Sphinx/cmake.py -@@ -11,24 +11,24 @@ from typing import Any, List, Tuple, Type, cast - - import sphinx - --# Require at least Sphinx 2.x. --# flake8 issues E402 for imports after this, but the purpose of this --# check is to fail more clearly if the imports below will fail. --assert sphinx.version_info >= (2,) -- --from docutils.utils.code_analyzer import Lexer, LexerError --from docutils.parsers.rst import Directive, directives --from docutils.transforms import Transform --from docutils.nodes import Element, Node, TextElement, system_message --from docutils import io, nodes -- --from sphinx.directives import ObjectDescription, nl_escape_re --from sphinx.domains import Domain, ObjType --from sphinx.roles import XRefRole --from sphinx.util.docutils import ReferenceRole --from sphinx.util.nodes import make_refnode --from sphinx.util import logging, ws_re --from sphinx import addnodes -+# The following imports may fail if we don't have Sphinx 2.x or later. -+if sphinx.version_info >= (2,): -+ from docutils.utils.code_analyzer import Lexer, LexerError -+ from docutils.parsers.rst import Directive, directives -+ from docutils.transforms import Transform -+ from docutils.nodes import Element, Node, TextElement, system_message -+ from docutils import io, nodes -+ -+ from sphinx.directives import ObjectDescription, nl_escape_re -+ from sphinx.domains import Domain, ObjType -+ from sphinx.roles import XRefRole -+ from sphinx.util.docutils import ReferenceRole -+ from sphinx.util.nodes import make_refnode -+ from sphinx.util import logging, ws_re -+ from sphinx import addnodes -+else: -+ # Sphinx 2.x is required. -+ assert sphinx.version_info >= (2,) - - # END imports - --- -2.41.0 - diff --git a/0007-Utilities-Sphinx-Fix-some-flake8-gripes.patch b/0007-Utilities-Sphinx-Fix-some-flake8-gripes.patch deleted file mode 100644 index 5110241..0000000 --- a/0007-Utilities-Sphinx-Fix-some-flake8-gripes.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 528cdc75519987a2004db94d1e7b0e445b1fb158 Mon Sep 17 00:00:00 2001 -From: Matthew Woehlke -Date: Tue, 13 Jun 2023 11:39:48 -0400 -Subject: [PATCH 7/9] Utilities/Sphinx: Fix some flake8 gripes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Reorder some imports to better conform to what flake8 wants. - -Signed-off-by: Björn Esser ---- - Utilities/Sphinx/cmake.py | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py -index e6c2266938..0afd705a9e 100644 ---- a/Utilities/Sphinx/cmake.py -+++ b/Utilities/Sphinx/cmake.py -@@ -5,7 +5,6 @@ - - import os - import re -- - from dataclasses import dataclass - from typing import Any, List, Tuple, Type, cast - -@@ -13,19 +12,19 @@ import sphinx - - # The following imports may fail if we don't have Sphinx 2.x or later. - if sphinx.version_info >= (2,): -- from docutils.utils.code_analyzer import Lexer, LexerError -+ from docutils import io, nodes -+ from docutils.nodes import Element, Node, TextElement, system_message - from docutils.parsers.rst import Directive, directives - from docutils.transforms import Transform -- from docutils.nodes import Element, Node, TextElement, system_message -- from docutils import io, nodes -+ from docutils.utils.code_analyzer import Lexer, LexerError - -+ from sphinx import addnodes - from sphinx.directives import ObjectDescription, nl_escape_re - from sphinx.domains import Domain, ObjType - from sphinx.roles import XRefRole -+ from sphinx.util import logging, ws_re - from sphinx.util.docutils import ReferenceRole - from sphinx.util.nodes import make_refnode -- from sphinx.util import logging, ws_re -- from sphinx import addnodes - else: - # Sphinx 2.x is required. - assert sphinx.version_info >= (2,) -@@ -47,10 +46,10 @@ else: - # - manual/cmake-buildsystem.7.html - # (with nested $<..>; relative and absolute paths, "::") - -+from pygments.lexer import bygroups # noqa I100 - from pygments.lexers import CMakeLexer - from pygments.token import (Comment, Name, Number, Operator, Punctuation, - String, Text, Whitespace) --from pygments.lexer import bygroups - - # Notes on regular expressions below: - # - [\.\+-] are needed for string constants like gtk+-2.0 --- -2.41.0 - diff --git a/0008-Tutorial-Extend-literal-include-to-contain-full-code.patch b/0008-Tutorial-Extend-literal-include-to-contain-full-code.patch deleted file mode 100644 index ccdbdb9..0000000 --- a/0008-Tutorial-Extend-literal-include-to-contain-full-code.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a8679c997d05dffda9f0e892221da244177ee502 Mon Sep 17 00:00:00 2001 -From: Markus Ferrell -Date: Wed, 14 Jun 2023 19:34:41 -0400 -Subject: [PATCH 8/9] Tutorial: Extend literal include to contain full code - changes in solution -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The solution for step 7 todo 5 did not include all of the code changes. -Modify it to include the needed `#endif` code change. - -Signed-off-by: Björn Esser ---- - Help/guide/tutorial/Adding System Introspection.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Help/guide/tutorial/Adding System Introspection.rst b/Help/guide/tutorial/Adding System Introspection.rst -index b3147736a3..117b2306d9 100644 ---- a/Help/guide/tutorial/Adding System Introspection.rst -+++ b/Help/guide/tutorial/Adding System Introspection.rst -@@ -156,7 +156,7 @@ compute the square root in the ``mysqrt`` function. The ``mysqrt`` function in - :name: MathFunctions/mysqrt.cxx-ifdef - :language: c++ - :start-after: // if we have both log and exp then use them -- :end-before: // do ten iterations -+ :end-before: return result; - - .. raw:: html - --- -2.41.0 - diff --git a/0009-FindPostgreSQL-Add-support-for-version-15.patch b/0009-FindPostgreSQL-Add-support-for-version-15.patch deleted file mode 100644 index 0be05d5..0000000 --- a/0009-FindPostgreSQL-Add-support-for-version-15.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 80ba2cccfc32f4c317a1a4d715344ee602f976e8 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Mon, 12 Jun 2023 11:13:15 -0400 -Subject: [PATCH 9/9] FindPostgreSQL: Add support for version 15 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Björn Esser ---- - Modules/FindPostgreSQL.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake -index c92fbdcd22..6e970e8432 100644 ---- a/Modules/FindPostgreSQL.cmake -+++ b/Modules/FindPostgreSQL.cmake -@@ -53,7 +53,7 @@ is set regardless of the presence of the ``Server`` component in find_package ca - # In Windows the default installation of PostgreSQL uses that as part of the path. - # E.g C:\Program Files\PostgreSQL\8.4. - # Currently, the following version numbers are known to this module: --# "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0" -+# "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0" - # - # To use this variable just do something like this: - # set(PostgreSQL_ADDITIONAL_VERSIONS "9.2" "8.4.4") -@@ -102,7 +102,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher - - - set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} -- "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") -+ "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") - - # Define additional search paths for root directories. - set( PostgreSQL_ROOT_DIRECTORIES --- -2.41.0 - diff --git a/0010-list-restore-SUBLIST-behavior.patch b/0010-list-restore-SUBLIST-behavior.patch deleted file mode 100644 index 10968d9..0000000 --- a/0010-list-restore-SUBLIST-behavior.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 1cfaed0684e7e26687a3a0a607925456dc656c57 Mon Sep 17 00:00:00 2001 -From: Marc Chevrier -Date: Fri, 16 Jun 2023 15:09:57 +0200 -Subject: [PATCH] list(): restore SUBLIST behavior - -Fixes: #25002 ---- - Source/cmList.h | 2 +- - Tests/RunCMake/list/SUBLIST.cmake | 51 +++++++++++++++++++++++++++++++ - 2 files changed, 52 insertions(+), 1 deletion(-) - -diff --git a/Source/cmList.h b/Source/cmList.h -index d9ce9510c6b..eba0400c934 100644 ---- a/Source/cmList.h -+++ b/Source/cmList.h -@@ -322,7 +322,7 @@ public: - // extract sublist in range [first, last) - cmList sublist(const_iterator first, const_iterator last) const - { -- return cmList{ first, last }; -+ return cmList{ first, last, ExpandElements::No, EmptyElements::Yes }; - } - // Extract sublist in range [first, last) - // Throw std::out_of_range if pos is invalid -diff --git a/Tests/RunCMake/list/SUBLIST.cmake b/Tests/RunCMake/list/SUBLIST.cmake -index fd15c28447d..6a33addc846 100644 ---- a/Tests/RunCMake/list/SUBLIST.cmake -+++ b/Tests/RunCMake/list/SUBLIST.cmake -@@ -44,3 +44,54 @@ list(SUBLIST mylist 1 -1 result) - if (NOT result STREQUAL "bravo;charlie;delta") - message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"bravo;charlie;delta\"") - endif() -+ -+ -+set(mylist ";;") -+ -+unset(result) -+list(SUBLIST mylist 0 0 result) -+ -+if (NOT result STREQUAL "") -+ message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"\"") -+endif() -+ -+unset(result) -+list(SUBLIST mylist 0 1 result) -+ -+if (NOT result STREQUAL "") -+ message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"\"") -+endif() -+ -+unset(result) -+list(SUBLIST mylist 0 2 result) -+ -+if (NOT result STREQUAL ";") -+ message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \";\"") -+endif() -+ -+unset(result) -+list(SUBLIST mylist 0 3 result) -+ -+if (NOT result STREQUAL ";;") -+ message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \";;\"") -+endif() -+ -+ -+set(mylist [[a\;b;c\;d;e]]) -+ -+unset(result) -+list(SUBLIST mylist 1 2 result) -+ -+if (NOT result STREQUAL "c;d;e") -+ message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"c;d;e\"") -+endif() -+ -+ -+set(mylist [[a\;b;c\\;d;e;f;g;h]]) -+ -+unset(result) -+list(SUBLIST mylist 1 -1 result) -+ -+if (NOT result STREQUAL "c\\;d;e;f;g;h") -+ message (FATAL_ERROR "SUBLIST is \"${result}\", expected is \"c\\;d;e;f;g;h\"") -+endif() --- -GitLab - diff --git a/cmake.spec b/cmake.spec index 7517b85..b75ffad 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,10 +69,10 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 1 # Set to RC version if building RC, else comment out. -%global rcsuf rc2 +%global rcsuf rc3 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -115,18 +115,6 @@ Source5: %{name}.req # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch -# Upstream -Patch1001: 0001-Utilities-Sphinx-Fix-flake8-E124-diagnostic-in-cmake.patch -Patch1002: 0002-Utilities-Sphinx-Restore-explicit-check-for-Sphinx-2.patch -Patch1003: 0003-Tests-Find-GIT_EXECUTABLE-early-enough-to-use-in-all.patch -Patch1004: 0004-Tests-Require-git-to-enable-RunCMake.CMP0150-test.patch -Patch1005: 0005-Help-Add-3.27-release-note-for-TARGET_RUNTIME_DLL_DI.patch -Patch1006: 0006-Utilities-Sphinx-Don-t-ignore-flake8-E402.patch -Patch1007: 0007-Utilities-Sphinx-Fix-some-flake8-gripes.patch -Patch1008: 0008-Tutorial-Extend-literal-include-to-contain-full-code.patch -Patch1009: 0009-FindPostgreSQL-Add-support-for-version-15.patch -Patch1010: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8569.patch#/0010-list-restore-SUBLIST-behavior.patch - # Patch for renaming on EPEL %if 0%{?name_suffix:1} Patch1: %{name}-rename.patch @@ -565,6 +553,10 @@ popd %changelog +* Tue Jun 20 2023 Björn Esser - 3.27.0~rc3-1 +- cmake-3.27.0-rc3 + Fixes rhbz#2214407 + * Mon Jun 19 2023 Björn Esser - 3.27.0~rc2-2 - Backport some upstream patches which will be included in rc3 diff --git a/sources b/sources index e9a3244..acc4505 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.0-rc2.tar.gz) = c354caac080510d779c112f5301a6158d42157e518176b63d1784fbbf3a19fe0f62028f1d5e4b4f227002e9c3b4309c31826024ea9b2d6e130d5db9bcec6e9d8 +SHA512 (cmake-3.27.0-rc3.tar.gz) = 670e70c1422356e552716f938854ca849a024c90e12c5d59f1ccc73db5f437d55fbc129b879b59179d181f3229e7fb2a6827e0b8def1c8c282b3c512e7301fbd From 0c33c34b3aed09309a1a62eb2b59fa16eef6d97e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 30 Jun 2023 18:49:53 +0200 Subject: [PATCH 157/238] cmake-3.27.0-rc4 Fixes rhbz#2218941 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index b75ffad..ef563d7 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global baserelease 1 # Set to RC version if building RC, else comment out. -%global rcsuf rc3 +%global rcsuf rc4 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -553,6 +553,10 @@ popd %changelog +* Fri Jun 30 2023 Björn Esser - 3.27.0~rc4-1 +- cmake-3.27.0-rc4 + Fixes rhbz#2218941 + * Tue Jun 20 2023 Björn Esser - 3.27.0~rc3-1 - cmake-3.27.0-rc3 Fixes rhbz#2214407 diff --git a/sources b/sources index acc4505..d8a92e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.0-rc3.tar.gz) = 670e70c1422356e552716f938854ca849a024c90e12c5d59f1ccc73db5f437d55fbc129b879b59179d181f3229e7fb2a6827e0b8def1c8c282b3c512e7301fbd +SHA512 (cmake-3.27.0-rc4.tar.gz) = acc5d83605a227005ac8f193dac1a3f4d3c1f2356c259672db1b705e59e5850cf261bdb7fa8a03147af7ec0547e8be4fd6ed3afb539154f95f068eeaab7f00e4 From 91fff81fc3d6a9d37aab6c1f8a986b4dfb72158c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 6 Jul 2023 15:11:26 +0200 Subject: [PATCH 158/238] Fix FTBFS for redhat-rpm-config v260 and later --- cmake.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index ef563d7..88f523b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -53,7 +53,10 @@ %bcond_without X11_test # Do not build non-lto objects to reduce build time significantly. -%global optflags %(echo '%{optflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g') +%global build_cflags %(echo '%{build_cflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g') +%global build_cxxflags %(echo '%{build_cxxflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g') +%global build_fflags %(echo '%{build_fflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g') +%global build_fcflags %(echo '%{build_fflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g') # Place rpm-macros into proper location %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) @@ -69,7 +72,7 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. %global rcsuf rc4 @@ -553,6 +556,9 @@ popd %changelog +* Thu Jul 06 2023 Björn Esser - 3.27.0~rc4-2 +- Fix FTBFS for redhat-rpm-config v260 and later + * Fri Jun 30 2023 Björn Esser - 3.27.0~rc4-1 - cmake-3.27.0-rc4 Fixes rhbz#2218941 From cad39465ff590b6397dea98dd2f69e5226f2cce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 6 Jul 2023 16:24:41 +0200 Subject: [PATCH 159/238] Re-include tests that were failing with rc1 --- cmake.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/cmake.spec b/cmake.spec index 88f523b..a229405 100644 --- a/cmake.spec +++ b/cmake.spec @@ -465,13 +465,6 @@ NO_TEST="$NO_TEST|CustomCommand|RunCMake.PositionIndependentCode" NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-default" NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-OnePackPerGroup" NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-AllInOne" -# Failing in 3.27.0-rc1 for some regex mismatch, -# but command actually succeeds. -NO_TEST="$NO_TEST|RunCMake.Make" -NO_TEST="$NO_TEST|RunCMake.BuildDepends" -# Failing in 3.27.0-rc1 for some timestamp quirks. -NO_TEST="$NO_TEST|Qt6Autogen.RerunMocBasic" -NO_TEST="$NO_TEST|Qt6Autogen.RerunRccDepends" # curl test may fail during bootstrap %if %{with bootstrap} NO_TEST="$NO_TEST|curl" @@ -558,6 +551,7 @@ popd %changelog * Thu Jul 06 2023 Björn Esser - 3.27.0~rc4-2 - Fix FTBFS for redhat-rpm-config v260 and later +- Re-include tests that were failing with rc1 * Fri Jun 30 2023 Björn Esser - 3.27.0~rc4-1 - cmake-3.27.0-rc4 From 2c0f546ee8d433940e8af9369ba432de3c235e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 14 Jul 2023 19:55:02 +0200 Subject: [PATCH 160/238] cmake-3.27.0-rc5 Fixes rhbz#2222977 --- cmake.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index a229405..697b255 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,10 +72,10 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 1 # Set to RC version if building RC, else comment out. -%global rcsuf rc4 +%global rcsuf rc5 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -549,6 +549,10 @@ popd %changelog +* Fri Jul 14 2023 Björn Esser - 3.27.0~rc5-1 +- cmake-3.27.0-rc5 + Fixes rhbz#2222977 + * Thu Jul 06 2023 Björn Esser - 3.27.0~rc4-2 - Fix FTBFS for redhat-rpm-config v260 and later - Re-include tests that were failing with rc1 diff --git a/sources b/sources index d8a92e5..d057232 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.0-rc4.tar.gz) = acc5d83605a227005ac8f193dac1a3f4d3c1f2356c259672db1b705e59e5850cf261bdb7fa8a03147af7ec0547e8be4fd6ed3afb539154f95f068eeaab7f00e4 +SHA512 (cmake-3.27.0-rc5.tar.gz) = b6be7a3b2aba827843e3f5cb2ac9ad21d7c9f8cd4913c0c1d64c7ccbc48654889b5d7e854613a87ebc780dc8381b48e8ae74d5b10209aaf82728d538bd600717 From 4e11520f2d913bce471f53156dfe21e77bee8215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 18 Jul 2023 23:02:44 +0200 Subject: [PATCH 161/238] cmake-3.27.0 Fixes rhbz#2223754 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 697b255..68603e7 100644 --- a/cmake.spec +++ b/cmake.spec @@ -75,7 +75,7 @@ %global baserelease 1 # Set to RC version if building RC, else comment out. -%global rcsuf rc5 +#global rcsuf rc1 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -549,6 +549,10 @@ popd %changelog +* Tue Jul 18 2023 Björn Esser - 3.27.0-1 +- cmake-3.27.0 + Fixes rhbz#2223754 + * Fri Jul 14 2023 Björn Esser - 3.27.0~rc5-1 - cmake-3.27.0-rc5 Fixes rhbz#2222977 diff --git a/sources b/sources index d057232..5abf594 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.0-rc5.tar.gz) = b6be7a3b2aba827843e3f5cb2ac9ad21d7c9f8cd4913c0c1d64c7ccbc48654889b5d7e854613a87ebc780dc8381b48e8ae74d5b10209aaf82728d538bd600717 +SHA512 (cmake-3.27.0.tar.gz) = 8b5836ac1c1f1e741ebbf6c9a1c9dca322dfd963598838a8789cd926fc071bde2fc53e42b6a2d5d8697f12d96dbf2cebdf03817d7d84b68256ef80b779a27fed From 47184c29d9955c7b1a7eb715e8315d71b62a1352 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 15:56:59 +0000 Subject: [PATCH 162/238] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 68603e7..f1740f9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -549,6 +549,9 @@ popd %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.27.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 18 2023 Björn Esser - 3.27.0-1 - cmake-3.27.0 Fixes rhbz#2223754 From 82675b936979f9e138258aeea135a910dd092bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 26 Jul 2023 00:55:04 +0200 Subject: [PATCH 163/238] cmake-3.27.1 Fixes rhbz#2226276 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index f1740f9..ee58618 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global major_version 3 %global minor_version 27 -%global patch_version 0 +%global patch_version 1 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 2 @@ -549,6 +549,10 @@ popd %changelog +* Tue Jul 25 2023 Björn Esser - 3.27.1-1 +- cmake-3.27.1 + Fixes rhbz#2226276 + * Wed Jul 19 2023 Fedora Release Engineering - 3.27.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 5abf594..2e45df0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.0.tar.gz) = 8b5836ac1c1f1e741ebbf6c9a1c9dca322dfd963598838a8789cd926fc071bde2fc53e42b6a2d5d8697f12d96dbf2cebdf03817d7d84b68256ef80b779a27fed +SHA512 (cmake-3.27.1.tar.gz) = d8831105fed3772bcb821a2b184fe0ffbff15795a5b0a89f2ad1cb0372a40c8f22f2bab72c671a6d17464521b7337067df929a5c3ece99f84848cc3a2fe6716f From 576059f704d97efc39a7a18e1b24c50c718eaa8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 26 Jul 2023 01:02:02 +0200 Subject: [PATCH 164/238] Fix baserelease --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index ee58618..e2cf527 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 1 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 1 # Set to RC version if building RC, else comment out. #global rcsuf rc1 From bd82644a098bfd56ec825e9afff7531e03f52210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 10 Aug 2023 21:33:51 +0200 Subject: [PATCH 165/238] cmake-3.27.2 Fixes rhbz#2231131 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index e2cf527..2f5996e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global major_version 3 %global minor_version 27 -%global patch_version 1 +%global patch_version 2 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -549,6 +549,10 @@ popd %changelog +* Thu Aug 10 2023 Björn Esser - 3.27.2-1 +- cmake-3.27.2 + Fixes rhbz#2231131 + * Tue Jul 25 2023 Björn Esser - 3.27.1-1 - cmake-3.27.1 Fixes rhbz#2226276 diff --git a/sources b/sources index 2e45df0..3b8286c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.1.tar.gz) = d8831105fed3772bcb821a2b184fe0ffbff15795a5b0a89f2ad1cb0372a40c8f22f2bab72c671a6d17464521b7337067df929a5c3ece99f84848cc3a2fe6716f +SHA512 (cmake-3.27.2.tar.gz) = a5fee6e97c69c525a5679c77f1615dbfde982fdbebb68b137a3fd2adf94a0a09773cc21fdc55936f039c13ebfc20ef852814158685e821a8545fcb314a6115f9 From 3cbfafffa5e880f40a7a5ab5479c1c4673aefb23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 17 Aug 2023 08:16:54 +0200 Subject: [PATCH 166/238] cmake-3.27.3 Fixes rhbz#2232421 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 2f5996e..01e5324 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global major_version 3 %global minor_version 27 -%global patch_version 2 +%global patch_version 3 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -549,6 +549,10 @@ popd %changelog +* Thu Aug 17 2023 Björn Esser - 3.27.3-1 +- cmake-3.27.3 + Fixes rhbz#2232421 + * Thu Aug 10 2023 Björn Esser - 3.27.2-1 - cmake-3.27.2 Fixes rhbz#2231131 diff --git a/sources b/sources index 3b8286c..b5d9546 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.2.tar.gz) = a5fee6e97c69c525a5679c77f1615dbfde982fdbebb68b137a3fd2adf94a0a09773cc21fdc55936f039c13ebfc20ef852814158685e821a8545fcb314a6115f9 +SHA512 (cmake-3.27.3.tar.gz) = cbb845d2a8724faf5c9b57c6350a130c981ef5d209eb34fd52a5940ff7e176b0ae6512f766ee9ee6f03063269179ba15e123690a0d62ac65e32ffe8027806d9f From 94df49d123db8d704672aea6eee458f82e023761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 24 Aug 2023 08:51:29 +0200 Subject: [PATCH 167/238] cmake-3.27.4 Fixes rhbz#2233852 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 01e5324..b1f5b4a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global major_version 3 %global minor_version 27 -%global patch_version 3 +%global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -549,6 +549,10 @@ popd %changelog +* Thu Aug 24 2023 Björn Esser - 3.27.4-1 +- cmake-3.27.4 + Fixes rhbz#2233852 + * Thu Aug 17 2023 Björn Esser - 3.27.3-1 - cmake-3.27.3 Fixes rhbz#2232421 diff --git a/sources b/sources index b5d9546..022d5e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.3.tar.gz) = cbb845d2a8724faf5c9b57c6350a130c981ef5d209eb34fd52a5940ff7e176b0ae6512f766ee9ee6f03063269179ba15e123690a0d62ac65e32ffe8027806d9f +SHA512 (cmake-3.27.4.tar.gz) = fc04b041f5c73b0a969ba09251e00e20f33e7a76460630d60e95ce08086c6b41b82315bd8782c19070b5f12a4290858825687f816b69ad5df8101053b4a2b48a From cbd49edadef75fe54898ff1274f59b71ca92abf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 28 Aug 2023 17:51:07 +0200 Subject: [PATCH 168/238] Add upstream patch to fix linking non-builtin libatomic on some arches --- ...tomic-when-needed-on-any-Linux-archi.patch | 34 +++++++++++++++++++ cmake.spec | 8 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch diff --git a/0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch b/0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch new file mode 100644 index 0000000..e9ab05e --- /dev/null +++ b/0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch @@ -0,0 +1,34 @@ +From fa3c4b6dbfaa4eb1d666c1bea4c759d221b7ad98 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Thu, 24 Aug 2023 13:00:13 -0400 +Subject: [PATCH] Source: Link libatomic when needed on any Linux architecture +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Extend commit 78bbd58545 (Source: Link libatomic when needed on Linux +32-bit ARM, 2023-07-27, v3.27.2~10^2) to check for libatomic on more +architectures. + +Fixes: #25204 +Signed-off-by: Björn Esser +--- + Source/Checks/cm_cxx_features.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake +index 98d5eff072..02627464cc 100644 +--- a/Source/Checks/cm_cxx_features.cmake ++++ b/Source/Checks/cm_cxx_features.cmake +@@ -96,7 +96,7 @@ else() + set(CMake_HAVE_CXX_FILESYSTEM FALSE) + endif() + +-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l|sparc") ++if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|aarch64)$") + cm_check_cxx_feature(atomic_builtin) + if(NOT CMake_HAVE_CXX_ATOMIC_BUILTIN) + set(cm_check_cxx_feature_LINK_LIBRARIES atomic) +-- +2.41.0 + diff --git a/cmake.spec b/cmake.spec index b1f5b4a..13a60ee 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -123,6 +123,9 @@ Patch100: %{name}-findruby.patch Patch1: %{name}-rename.patch %endif +# https://gitlab.kitware.com/cmake/cmake/-/issues/25204 +Patch10001: 0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch + BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc-c++ @@ -549,6 +552,9 @@ popd %changelog +* Mon Aug 28 2023 Björn Esser - 3.27.4-2 +- Add upstream patch to fix linking non-builtin libatomic on some arches + * Thu Aug 24 2023 Björn Esser - 3.27.4-1 - cmake-3.27.4 Fixes rhbz#2233852 From 9802a8d657560f7b7a019a9f9405d731477441d9 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 31 Aug 2023 14:18:09 +0300 Subject: [PATCH 169/238] Only require cmake-rpm-macros when rpm-build is installed There are other use-cases for cmake besides building rpms, for which a hard requirement of rpm is absurd. Ironically enough, this hard dependency also causes an ugly conflict requiring --nodeps hacks when building rpm's own test-suite. A conditional dependency on rpm-build sorts the issue nicely with no regressions to the use-case of building packages. --- cmake.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 13a60ee..32fdbb1 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -208,7 +208,7 @@ BuildRequires: %{name}-rpm-macros BuildRequires: make Requires: %{name}-data = %{version}-%{release} -Requires: %{name}-rpm-macros = %{version}-%{release} +Requires: (%{name}-rpm-macros = %{version}-%{release} if rpm-build) Requires: %{name}-filesystem%{?_isa} = %{version}-%{release} # Explicitly require make. (rhbz#1862014) @@ -552,6 +552,9 @@ popd %changelog +* Thu Aug 31 2023 Panu Matilainen - 3.27.4-3 +- Only require cmake-rpm-macros when rpm-build is installed + * Mon Aug 28 2023 Björn Esser - 3.27.4-2 - Add upstream patch to fix linking non-builtin libatomic on some arches From 1c4c4226f40a91f00ec5198cc70e1fce751d066d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 1 Sep 2023 13:18:35 +0200 Subject: [PATCH 170/238] Fix outdated CI configuration --- cmake.spec | 5 ++++- plans/ci.fmf | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 32fdbb1..8d45f61 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -552,6 +552,9 @@ popd %changelog +* Fri Sep 01 2023 Björn Esser - 3.27.4-4 +- Fix outdated CI configuration + * Thu Aug 31 2023 Panu Matilainen - 3.27.4-3 - Only require cmake-rpm-macros when rpm-build is installed diff --git a/plans/ci.fmf b/plans/ci.fmf index 1ad2c12..85710d6 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -3,4 +3,4 @@ discover: how: fmf directory: tests execute: - how: beakerlib + how: tmt From 18bbba6a1bbaf7c21777bcd3860f16799f2504ee Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 2 Sep 2023 09:48:47 +0000 Subject: [PATCH 171/238] Convert license to SPDX --- cmake.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 8d45f61..01d053d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 4 +%global baserelease 5 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -99,7 +99,7 @@ Summary: Cross-platform make system # Source/kwsys/MD5.c is zlib # some GPL-licensed bison-generated files, which all include an # exception granting redistribution under terms of your choice -License: BSD and MIT and zlib%{?with_bundled_cppdap: and Apache-2.0} +License: BSD-3-Clause AND MIT-open-group AND Zlib%{?with_bundled_cppdap: AND Apache-2.0} URL: http://www.cmake.org Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{orig_name}-%{tar_version}.tar.gz Source1: %{name}-init.el @@ -552,6 +552,9 @@ popd %changelog +* Sat Sep 02 2023 Tom Stellard - 3.27.4-5 +- Convert license to SPDX + * Fri Sep 01 2023 Björn Esser - 3.27.4-4 - Fix outdated CI configuration From 4b282d073f363be47b8eda11dea9a5b45073e59e Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 6 Sep 2023 10:52:07 +0300 Subject: [PATCH 172/238] Only require cmake-rpm-macros when rpm-build is installed part II Turns out there's a duplicate dependency on cmake-rpm-macros in the -data package. This looks redundant but... Should've been in commit 9802a8d657560f7b7a019a9f9405d731477441d9 --- cmake.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 01d053d..b2f3d73 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 5 +%global baserelease 6 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -237,7 +237,7 @@ generation, code generation, and template instantiation. Summary: Common data-files for %{name} Requires: %{name} = %{version}-%{release} Requires: %{name}-filesystem = %{version}-%{release} -Requires: %{name}-rpm-macros = %{version}-%{release} +Requires: (%{name}-rpm-macros = %{version}-%{release} if rpm-build) %if %{with emacs} %if 0%{?fedora} || 0%{?rhel} >= 7 Requires: emacs-filesystem%{?_emacs_version: >= %{_emacs_version}} @@ -552,6 +552,9 @@ popd %changelog +* Wed Sep 04 2023 Panu Matilainen - 3.27.4-6 +- Only require cmake-rpm-macros when rpm-build is installed part II + * Sat Sep 02 2023 Tom Stellard - 3.27.4-5 - Convert license to SPDX From dadba242b011557cd21cac79cafe7c09dba37bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 14 Sep 2023 18:57:23 +0200 Subject: [PATCH 173/238] Add upstream patches from milestone to cmake-3.27.5 --- ...tomic-when-needed-on-any-Linux-archi.patch | 3 +- ...INFORMATION_FORMAT-is-initialized-fr.patch | 38 ++++++++++ ...t-support-config-independent-Fortran.patch | 53 +++++++++++++ ...ormation-compute-link-info-for-modul.patch | 43 +++++++++++ ...pport-for-http-redirects-during-Subm.patch | 44 +++++++++++ ...e-forward-CMAKE_OSX_DEPLOYMENT_TARGE.patch | 31 ++++++++ ...FindBoost-Add-support-for-Boost-1.83.patch | 75 +++++++++++++++++++ ...sary-CUDA-device-linking-for-OBJECT-.patch | 64 ++++++++++++++++ ...-INTERFACE_AUTOMOC_MACRO_NAMES-effic.patch | 35 +++++++++ cmake.spec | 16 +++- 10 files changed, 398 insertions(+), 4 deletions(-) create mode 100644 0002-Help-MSVC_DEBUG_INFORMATION_FORMAT-is-initialized-fr.patch create mode 100644 0003-cmGeneratorTarget-support-config-independent-Fortran.patch create mode 100644 0004-cmComputeLinkInformation-compute-link-info-for-modul.patch create mode 100644 0005-ctest-Restore-support-for-http-redirects-during-Subm.patch create mode 100644 0006-FortranCInterface-forward-CMAKE_OSX_DEPLOYMENT_TARGE.patch create mode 100644 0007-FindBoost-Add-support-for-Boost-1.83.patch create mode 100644 0008-VS-Avoid-unnecessary-CUDA-device-linking-for-OBJECT-.patch create mode 100644 0009-Autogen-Evaluate-INTERFACE_AUTOMOC_MACRO_NAMES-effic.patch diff --git a/0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch b/0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch index e9ab05e..5e92ac5 100644 --- a/0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch +++ b/0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch @@ -1,7 +1,8 @@ From fa3c4b6dbfaa4eb1d666c1bea4c759d221b7ad98 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 24 Aug 2023 13:00:13 -0400 -Subject: [PATCH] Source: Link libatomic when needed on any Linux architecture +Subject: [PATCH 1/9] Source: Link libatomic when needed on any Linux + architecture MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/0002-Help-MSVC_DEBUG_INFORMATION_FORMAT-is-initialized-fr.patch b/0002-Help-MSVC_DEBUG_INFORMATION_FORMAT-is-initialized-fr.patch new file mode 100644 index 0000000..57da3aa --- /dev/null +++ b/0002-Help-MSVC_DEBUG_INFORMATION_FORMAT-is-initialized-fr.patch @@ -0,0 +1,38 @@ +From 91dc94c4aca611865bf5cb4e9fec6b3422d1de9a Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Tue, 5 Sep 2023 14:54:04 -0400 +Subject: [PATCH 2/9] Help: MSVC_DEBUG_INFORMATION_FORMAT is initialized from + associated variable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The `CMAKE_MSVC_DEBUG_INFORMATION_FORMAT` variable docs mention that it +initializes the `MSVC_DEBUG_INFORMATION_FORMAT` target property, but the +property's docs was missing any mention of the variable. + +Follow the pattern from commit c1b07ca9da (Help: MSVC_RUNTIME_LIBRARY is +initialized from associated variable, 2022-08-13, v3.25.0-rc1~317^2). + +Fixes: #25216 +Signed-off-by: Björn Esser +--- + Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst b/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst +index 0c7845ce4a..7e08b483c4 100644 +--- a/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst ++++ b/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst +@@ -21,6 +21,8 @@ support per-configuration specification. For example, the code: + selects for the target ``foo`` the program database debug information format + for the Debug configuration. + ++This property is initialized from the value of the ++:variable:`CMAKE_MSVC_DEBUG_INFORMATION_FORMAT` variable, if it is set. + If this property is not set, CMake selects a debug information format using + the default value ``$<$:ProgramDatabase>``, if + supported by the compiler, and otherwise +-- +2.41.0 + diff --git a/0003-cmGeneratorTarget-support-config-independent-Fortran.patch b/0003-cmGeneratorTarget-support-config-independent-Fortran.patch new file mode 100644 index 0000000..42f0976 --- /dev/null +++ b/0003-cmGeneratorTarget-support-config-independent-Fortran.patch @@ -0,0 +1,53 @@ +From 6251edaed1c4f55625d96dc31e044a9fd23e1db2 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Tue, 5 Sep 2023 15:55:19 -0400 +Subject: [PATCH 3/9] cmGeneratorTarget: support config-independent Fortran + source queries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some locations care about "any config with Fortran", so make a query for +such (they may not know any configuration names themselves). + +Signed-off-by: Björn Esser +--- + Source/cmGeneratorTarget.cxx | 9 +++++++++ + Source/cmGeneratorTarget.h | 1 + + 2 files changed, 10 insertions(+) + +diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx +index 357d0a66a1..7d1fcf3e5c 100644 +--- a/Source/cmGeneratorTarget.cxx ++++ b/Source/cmGeneratorTarget.cxx +@@ -8873,6 +8873,15 @@ bool cmGeneratorTarget::HaveFortranSources(std::string const& config) const + }); + } + ++bool cmGeneratorTarget::HaveFortranSources() const ++{ ++ auto sources = cmGeneratorTarget::GetAllConfigSources(); ++ return std::any_of(sources.begin(), sources.end(), ++ [](AllConfigSource const& sf) -> bool { ++ return sf.Source->GetLanguage() == "Fortran"_s; ++ }); ++} ++ + bool cmGeneratorTarget::HaveCxx20ModuleSources() const + { + auto const& fs_names = this->Target->GetAllFileSetNames(); +diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h +index 78945c3fa9..dca69fd001 100644 +--- a/Source/cmGeneratorTarget.h ++++ b/Source/cmGeneratorTarget.h +@@ -1247,6 +1247,7 @@ public: + cmGeneratorTarget const* t2) const; + }; + ++ bool HaveFortranSources() const; + bool HaveFortranSources(std::string const& config) const; + + // C++20 module support queries. +-- +2.41.0 + diff --git a/0004-cmComputeLinkInformation-compute-link-info-for-modul.patch b/0004-cmComputeLinkInformation-compute-link-info-for-modul.patch new file mode 100644 index 0000000..70e271a --- /dev/null +++ b/0004-cmComputeLinkInformation-compute-link-info-for-modul.patch @@ -0,0 +1,43 @@ +From 74b1d6caf31d9921b8311012ead4497865e77396 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Tue, 5 Sep 2023 15:56:03 -0400 +Subject: [PATCH 4/9] cmComputeLinkInformation: compute link info for + module-using targets +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Targets which contain C++ module or Fortran sources need to participate +in link information unconditionally regardless of whether they actually +have link artifacts or not. + +Fixes: #25223 +Signed-off-by: Björn Esser +--- + Source/cmComputeLinkInformation.cxx | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx +index ebbb88f6a2..4804565840 100644 +--- a/Source/cmComputeLinkInformation.cxx ++++ b/Source/cmComputeLinkInformation.cxx +@@ -533,11 +533,14 @@ cmComputeLinkInformation::GetObjectLibrariesLinked() const + + bool cmComputeLinkInformation::Compute() + { +- // Skip targets that do not link. ++ // Skip targets that do not link or have link-like information consumers may ++ // need (namely modules). + if (!(this->Target->GetType() == cmStateEnums::EXECUTABLE || + this->Target->GetType() == cmStateEnums::SHARED_LIBRARY || + this->Target->GetType() == cmStateEnums::MODULE_LIBRARY || +- this->Target->GetType() == cmStateEnums::STATIC_LIBRARY)) { ++ this->Target->GetType() == cmStateEnums::STATIC_LIBRARY || ++ this->Target->HaveCxx20ModuleSources() || ++ this->Target->HaveFortranSources())) { + return false; + } + +-- +2.41.0 + diff --git a/0005-ctest-Restore-support-for-http-redirects-during-Subm.patch b/0005-ctest-Restore-support-for-http-redirects-during-Subm.patch new file mode 100644 index 0000000..6cf4d50 --- /dev/null +++ b/0005-ctest-Restore-support-for-http-redirects-during-Subm.patch @@ -0,0 +1,44 @@ +From 26ce8dc290710ddbad49335f36968d850176b634 Mon Sep 17 00:00:00 2001 +From: Zack Galbreath +Date: Thu, 7 Sep 2023 12:12:30 -0400 +Subject: [PATCH 5/9] ctest: Restore support for http redirects during Submit + step +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +After CDash PR 1519 introduced HTTP status codes greater than 200 for +various error cases, CMake commit b7c871f745 (ctest: Update ctest_submit +for CDash behavior change, 2023-07-24, v3.27.1~3^2) modified CTest's +submit handler to check the status returned by CDash and throw an error +when this status is not equal to 200. + +That change had the unintended side effect of causing CTest submissions +to fail when uploading results to a URL that returns a redirect status +code (3xx). Fix this by configuring cURL to follow the redirect. The +status cURL reports to CTest is now 200 instead of 3xx when CDash is +located behind a redirect. + +Fixes: #25159 +Signed-off-by: Björn Esser +--- + Source/CTest/cmCTestSubmitHandler.cxx | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx +index 7d4b0a847c..c04f23a1fe 100644 +--- a/Source/CTest/cmCTestSubmitHandler.cxx ++++ b/Source/CTest/cmCTestSubmitHandler.cxx +@@ -309,6 +309,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP( + // specify target + ::curl_easy_setopt(curl, CURLOPT_URL, upload_as.c_str()); + ++ // follow redirects ++ ::curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); ++ + // CURLAUTH_BASIC is default, and here we allow additional methods, + // including more secure ones + ::curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); +-- +2.41.0 + diff --git a/0006-FortranCInterface-forward-CMAKE_OSX_DEPLOYMENT_TARGE.patch b/0006-FortranCInterface-forward-CMAKE_OSX_DEPLOYMENT_TARGE.patch new file mode 100644 index 0000000..34ecef3 --- /dev/null +++ b/0006-FortranCInterface-forward-CMAKE_OSX_DEPLOYMENT_TARGE.patch @@ -0,0 +1,31 @@ +From 84a097f0388f8fbf86aeada640f56132e3776335 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel +Date: Sun, 10 Sep 2023 21:10:27 -0400 +Subject: [PATCH 6/9] FortranCInterface: forward `CMAKE_OSX_DEPLOYMENT_TARGET` +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC needs to be taught about every macOS release it seems, so older +builds may not support usage on newer releases by default. + +Signed-off-by: Björn Esser +--- + Modules/FortranCInterface.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Modules/FortranCInterface.cmake b/Modules/FortranCInterface.cmake +index 2c85029ed4..81481a7ba7 100644 +--- a/Modules/FortranCInterface.cmake ++++ b/Modules/FortranCInterface.cmake +@@ -374,6 +374,7 @@ function(FortranCInterface_VERIFY) + "-DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}" + "-DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE}" + "-DFortranCInterface_BINARY_DIR=${FortranCInterface_BINARY_DIR}" ++ "-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}" + ${_FortranCInterface_OSX_ARCH} + ${_FortranCInterface_EXE_LINKER_FLAGS} + OUTPUT_VARIABLE _output) +-- +2.41.0 + diff --git a/0007-FindBoost-Add-support-for-Boost-1.83.patch b/0007-FindBoost-Add-support-for-Boost-1.83.patch new file mode 100644 index 0000000..16a43cf --- /dev/null +++ b/0007-FindBoost-Add-support-for-Boost-1.83.patch @@ -0,0 +1,75 @@ +From 897a149067b84375d094700632255c0b54f5e44c Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Mon, 11 Sep 2023 09:50:54 -0400 +Subject: [PATCH 7/9] FindBoost: Add support for Boost 1.83 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Update the list of known versions. + +Run the command + + cmake -DBOOST_DIR=/path/to/boost_1_83_0 \ + -P Utilities/Scripts/BoostScanDeps.cmake + +to extract dependencies from the 1.83.0 source tree. + +Dependencies differ from 1.82, as mentioned in the 1.83 release notes: + +* Boost.Timer no longer depends on Boost.Chrono + +Fixes: #25243 +Signed-off-by: Björn Esser +--- + Modules/FindBoost.cmake | 20 +++++++++++++++++--- + 1 file changed, 17 insertions(+), 3 deletions(-) + +diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake +index f2e4804d04..1f82bb52a1 100644 +--- a/Modules/FindBoost.cmake ++++ b/Modules/FindBoost.cmake +@@ -1365,7 +1365,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + set(_Boost_TIMER_DEPENDENCIES chrono) + set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) +- else() ++ elseif(Boost_VERSION_STRING VERSION_LESS 1.83.0) + set(_Boost_CONTRACT_DEPENDENCIES thread chrono) + set(_Boost_COROUTINE_DEPENDENCIES context) + set(_Boost_FIBER_DEPENDENCIES context) +@@ -1380,7 +1380,21 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + set(_Boost_TIMER_DEPENDENCIES chrono) + set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) +- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.83.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) ++ else() ++ set(_Boost_CONTRACT_DEPENDENCIES thread chrono) ++ set(_Boost_COROUTINE_DEPENDENCIES context) ++ set(_Boost_FIBER_DEPENDENCIES context) ++ set(_Boost_IOSTREAMS_DEPENDENCIES regex) ++ set(_Boost_JSON_DEPENDENCIES container) ++ set(_Boost_LOG_DEPENDENCIES log_setup filesystem thread regex chrono atomic) ++ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l) ++ set(_Boost_MPI_DEPENDENCIES serialization) ++ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization) ++ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version}) ++ set(_Boost_THREAD_DEPENDENCIES chrono atomic) ++ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) ++ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) ++ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.84.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) + message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") + endif() + endif() +@@ -1655,7 +1669,7 @@ else() + # _Boost_COMPONENT_HEADERS. See the instructions at the top of + # _Boost_COMPONENT_DEPENDENCIES. + set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} +- "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79" ++ "1.83.0" "1.83" "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79" + "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" + "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" + "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" +-- +2.41.0 + diff --git a/0008-VS-Avoid-unnecessary-CUDA-device-linking-for-OBJECT-.patch b/0008-VS-Avoid-unnecessary-CUDA-device-linking-for-OBJECT-.patch new file mode 100644 index 0000000..614e1d6 --- /dev/null +++ b/0008-VS-Avoid-unnecessary-CUDA-device-linking-for-OBJECT-.patch @@ -0,0 +1,64 @@ +From 6ebff6ebf8850a9372786bf56af8ee79dca6860d Mon Sep 17 00:00:00 2001 +From: Robert Maynard +Date: Mon, 11 Sep 2023 15:54:53 -0400 +Subject: [PATCH 8/9] VS: Avoid unnecessary CUDA device linking for OBJECT + libraries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without `CudaLink` fields, MSBuild tries to perform a device link step +for object libraries with CUDA_SEPARABLE_COMPILATION on them even when +not needed. This commonly was encountered when generating PTX or +OPTIX-IR output. + +Signed-off-by: Björn Esser +--- + Source/cmVisualStudio10TargetGenerator.cxx | 5 ++++- + Tests/CudaOnly/Fatbin/CMakeLists.txt | 1 + + Tests/CudaOnly/OptixIR/CMakeLists.txt | 1 + + 3 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx +index b3699ae739..b011615097 100644 +--- a/Source/cmVisualStudio10TargetGenerator.cxx ++++ b/Source/cmVisualStudio10TargetGenerator.cxx +@@ -3855,7 +3855,10 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaLinkOptions( + void cmVisualStudio10TargetGenerator::WriteCudaLinkOptions( + Elem& e1, std::string const& configName) + { +- if (this->GeneratorTarget->GetType() > cmStateEnums::MODULE_LIBRARY) { ++ // We need to write link options for OBJECT libraries so that ++ // we override the default device link behavior ( enabled ) when ++ // building object libraries with ptx/optix-ir/etc ++ if (this->GeneratorTarget->GetType() > cmStateEnums::OBJECT_LIBRARY) { + return; + } + +diff --git a/Tests/CudaOnly/Fatbin/CMakeLists.txt b/Tests/CudaOnly/Fatbin/CMakeLists.txt +index db0dc227e0..99744044c1 100644 +--- a/Tests/CudaOnly/Fatbin/CMakeLists.txt ++++ b/Tests/CudaOnly/Fatbin/CMakeLists.txt +@@ -10,6 +10,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../CUBIN/kernelB.cu + ${CMAKE_CURRENT_SOURCE_DIR}/../CUBIN/kernelC.cu) + + set_property(TARGET CudaFATBIN PROPERTY CUDA_FATBIN_COMPILATION ON) ++set_property(TARGET CudaFATBIN PROPERTY CUDA_SEPARABLE_COMPILATION ON) + + # Will use `cuModuleLoadFatBinary` to load the fatbinaries + add_executable(CudaOnlyFatbin main.cu) +diff --git a/Tests/CudaOnly/OptixIR/CMakeLists.txt b/Tests/CudaOnly/OptixIR/CMakeLists.txt +index afeabdade7..f408d40325 100644 +--- a/Tests/CudaOnly/OptixIR/CMakeLists.txt ++++ b/Tests/CudaOnly/OptixIR/CMakeLists.txt +@@ -13,6 +13,7 @@ if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "11.7.0") + set_property(TARGET CudaOptix PROPERTY CUDA_OPTIX_COMPILATION ON) + endif() + ++set_property(TARGET CudaOptix PROPERTY CUDA_SEPARABLE_COMPILATION ON) + set_property(TARGET CudaOptix PROPERTY CUDA_ARCHITECTURES native) + + add_executable(CudaOnlyOptixIR main.cu) +-- +2.41.0 + diff --git a/0009-Autogen-Evaluate-INTERFACE_AUTOMOC_MACRO_NAMES-effic.patch b/0009-Autogen-Evaluate-INTERFACE_AUTOMOC_MACRO_NAMES-effic.patch new file mode 100644 index 0000000..c368c8b --- /dev/null +++ b/0009-Autogen-Evaluate-INTERFACE_AUTOMOC_MACRO_NAMES-effic.patch @@ -0,0 +1,35 @@ +From 42adf3cba82c1f375d7a75a76697e674fd6f1b2f Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Tue, 12 Sep 2023 13:50:16 -0400 +Subject: [PATCH 9/9] Autogen: Evaluate INTERFACE_AUTOMOC_MACRO_NAMES + efficiently +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In commit c5c3aff1f5 (Autogen: Add INTERFACE_AUTOMOC_MACRO_NAMES target +property, 2023-04-03, v3.27.0-rc1~197^2) we forgot to mark the property +as a usage requirement. This is needed for efficient evaluation over +the target dependency closure. + +Fixes: #25238 +Signed-off-by: Björn Esser +--- + Source/cmGeneratorExpressionDAGChecker.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/cmGeneratorExpressionDAGChecker.h b/Source/cmGeneratorExpressionDAGChecker.h +index 1919b014e5..782d6c8b7d 100644 +--- a/Source/cmGeneratorExpressionDAGChecker.h ++++ b/Source/cmGeneratorExpressionDAGChecker.h +@@ -23,6 +23,7 @@ class cmGeneratorTarget; + SELECT(F, EvaluatingSystemIncludeDirectories, SYSTEM_INCLUDE_DIRECTORIES) \ + SELECT(F, EvaluatingCompileDefinitions, COMPILE_DEFINITIONS) \ + SELECT(F, EvaluatingCompileOptions, COMPILE_OPTIONS) \ ++ SELECT(F, EvaluatingAutoMocMacroNames, AUTOMOC_MACRO_NAMES) \ + SELECT(F, EvaluatingAutoUicOptions, AUTOUIC_OPTIONS) \ + SELECT(F, EvaluatingSources, SOURCES) \ + SELECT(F, EvaluatingCompileFeatures, COMPILE_FEATURES) \ +-- +2.41.0 + diff --git a/cmake.spec b/cmake.spec index b2f3d73..eca6f2c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 6 +%global baserelease 7 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -123,8 +123,15 @@ Patch100: %{name}-findruby.patch Patch1: %{name}-rename.patch %endif -# https://gitlab.kitware.com/cmake/cmake/-/issues/25204 Patch10001: 0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch +Patch10002: 0002-Help-MSVC_DEBUG_INFORMATION_FORMAT-is-initialized-fr.patch +Patch10003: 0003-cmGeneratorTarget-support-config-independent-Fortran.patch +Patch10004: 0004-cmComputeLinkInformation-compute-link-info-for-modul.patch +Patch10005: 0005-ctest-Restore-support-for-http-redirects-during-Subm.patch +Patch10006: 0006-FortranCInterface-forward-CMAKE_OSX_DEPLOYMENT_TARGE.patch +Patch10007: 0007-FindBoost-Add-support-for-Boost-1.83.patch +Patch10008: 0008-VS-Avoid-unnecessary-CUDA-device-linking-for-OBJECT-.patch +Patch10009: 0009-Autogen-Evaluate-INTERFACE_AUTOMOC_MACRO_NAMES-effic.patch BuildRequires: coreutils BuildRequires: findutils @@ -552,7 +559,10 @@ popd %changelog -* Wed Sep 04 2023 Panu Matilainen - 3.27.4-6 +* Thu Sep 14 2023 Björn Esser - 3.27.4-7 +- Add upstream patches from milestone to cmake-3.27.5 + +* Wed Sep 06 2023 Panu Matilainen - 3.27.4-6 - Only require cmake-rpm-macros when rpm-build is installed part II * Sat Sep 02 2023 Tom Stellard - 3.27.4-5 From 1ca25b2fbc553f9a2b004aa5d1b7c64928565fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 14 Sep 2023 21:34:36 +0200 Subject: [PATCH 174/238] Fix CI failure --- cmake.spec | 5 ++++- tests/cmake-testsuite-sanity/runtest.sh | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index eca6f2c..e224b60 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 7 +%global baserelease 8 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -559,6 +559,9 @@ popd %changelog +* Thu Sep 14 2023 Björn Esser - 3.27.4-8 +- Fix CI failure + * Thu Sep 14 2023 Björn Esser - 3.27.4-7 - Add upstream patches from milestone to cmake-3.27.5 diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh index d76fdc0..24f249e 100755 --- a/tests/cmake-testsuite-sanity/runtest.sh +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -56,7 +56,8 @@ rlJournalStart rlRun "dnf builddep -y $TmpDir/SPECS/*.spec" rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/rpmbuild.log" - rlRun "cd $TmpDir/BUILD/cmake*" + rlRun "CMakeDir=`ls $TmpDir/BUILD/cmake* | tail -n 1`" + rlRun "cd $TmpDir/BUILD/$CMakeDir" rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/bootstrap.log" rlRun "ln -s /usr/bin/cmake bin/cmake" From b105e87742ea19844533e27bf978379722467d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 14 Sep 2023 21:54:02 +0200 Subject: [PATCH 175/238] Fix CI failure, second try --- tests/cmake-testsuite-sanity/runtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh index 24f249e..cb00549 100755 --- a/tests/cmake-testsuite-sanity/runtest.sh +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -56,7 +56,7 @@ rlJournalStart rlRun "dnf builddep -y $TmpDir/SPECS/*.spec" rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/rpmbuild.log" - rlRun "CMakeDir=`ls $TmpDir/BUILD/cmake* | tail -n 1`" + rlRun "CMakeDir=`ls $TmpDir/BUILD | grep -E 'cmake-[0-9]+\.[0-9]+\.[0-9]+' | tail -n 1`" rlRun "cd $TmpDir/BUILD/$CMakeDir" rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/bootstrap.log" From e3ad0b0e2e56444c42a2e930a3848beb78aa9ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 15 Sep 2023 12:35:38 +0200 Subject: [PATCH 176/238] Fix CI failure finally --- cmake.spec | 5 ++++- tests/cmake-testsuite-sanity/runtest.sh | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index e224b60..f84e042 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 8 +%global baserelease 9 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -559,6 +559,9 @@ popd %changelog +* Fri Sep 15 2023 Björn Esser - 3.27.4-9 +- Fix CI failure finally + * Thu Sep 14 2023 Björn Esser - 3.27.4-8 - Fix CI failure diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh index cb00549..53d612d 100755 --- a/tests/cmake-testsuite-sanity/runtest.sh +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -56,11 +56,11 @@ rlJournalStart rlRun "dnf builddep -y $TmpDir/SPECS/*.spec" rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/rpmbuild.log" - rlRun "CMakeDir=`ls $TmpDir/BUILD | grep -E 'cmake-[0-9]+\.[0-9]+\.[0-9]+' | tail -n 1`" + rlRun "CMakeDir=`ls $TmpDir/BUILD | grep -E '^cmake-[0-9]+\.[0-9]+\.[0-9]+$' | tail -n 1`" rlRun "cd $TmpDir/BUILD/$CMakeDir" rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/bootstrap.log" - rlRun "ln -s /usr/bin/cmake bin/cmake" + rlRun "ln -fs /usr/bin/cmake bin/cmake" rlPhaseEnd rlPhaseStartTest "run testsuite" From 94fdf0975f59b76f8cb9ed0515eb98bab70f7a39 Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Sun, 24 Sep 2023 16:35:51 +0000 Subject: [PATCH 177/238] tests/cmake-testsuite-sanity: disable color output for terminal --- tests/cmake-testsuite-sanity/runtest.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh index 53d612d..42b4faa 100755 --- a/tests/cmake-testsuite-sanity/runtest.sh +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -37,6 +37,7 @@ if rlIsFedora; then else REQUIRES="$REQUIRES yum-utils" fi +export CLICOLOR=0 rlJournalStart rlPhaseStartSetup From 9d61b705e78d4fd80c9a7e8a032bf80dc194a6e2 Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Sun, 24 Sep 2023 16:39:05 +0000 Subject: [PATCH 178/238] tests/cmake-testsuite-sanity: build test dependency for RunCMake.GetPrerequisites --- tests/cmake-testsuite-sanity/runtest.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh index 42b4faa..ce77275 100755 --- a/tests/cmake-testsuite-sanity/runtest.sh +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -62,6 +62,7 @@ rlJournalStart rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/bootstrap.log" rlRun "ln -fs /usr/bin/cmake bin/cmake" + rlRun "make exit_code" rlPhaseEnd rlPhaseStartTest "run testsuite" From 140aec0b79b434f9b1db9824a54d1efd991e1d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 15 Sep 2023 13:55:56 +0200 Subject: [PATCH 179/238] cmake-3.27.5 Fixes rhbz#2239015 --- ...tomic-when-needed-on-any-Linux-archi.patch | 35 --------- ...INFORMATION_FORMAT-is-initialized-fr.patch | 38 ---------- ...t-support-config-independent-Fortran.patch | 53 ------------- ...ormation-compute-link-info-for-modul.patch | 43 ----------- ...pport-for-http-redirects-during-Subm.patch | 44 ----------- ...e-forward-CMAKE_OSX_DEPLOYMENT_TARGE.patch | 31 -------- ...FindBoost-Add-support-for-Boost-1.83.patch | 75 ------------------- ...sary-CUDA-device-linking-for-OBJECT-.patch | 64 ---------------- ...-INTERFACE_AUTOMOC_MACRO_NAMES-effic.patch | 35 --------- cmake.spec | 18 ++--- sources | 2 +- 11 files changed, 7 insertions(+), 431 deletions(-) delete mode 100644 0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch delete mode 100644 0002-Help-MSVC_DEBUG_INFORMATION_FORMAT-is-initialized-fr.patch delete mode 100644 0003-cmGeneratorTarget-support-config-independent-Fortran.patch delete mode 100644 0004-cmComputeLinkInformation-compute-link-info-for-modul.patch delete mode 100644 0005-ctest-Restore-support-for-http-redirects-during-Subm.patch delete mode 100644 0006-FortranCInterface-forward-CMAKE_OSX_DEPLOYMENT_TARGE.patch delete mode 100644 0007-FindBoost-Add-support-for-Boost-1.83.patch delete mode 100644 0008-VS-Avoid-unnecessary-CUDA-device-linking-for-OBJECT-.patch delete mode 100644 0009-Autogen-Evaluate-INTERFACE_AUTOMOC_MACRO_NAMES-effic.patch diff --git a/0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch b/0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch deleted file mode 100644 index 5e92ac5..0000000 --- a/0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch +++ /dev/null @@ -1,35 +0,0 @@ -From fa3c4b6dbfaa4eb1d666c1bea4c759d221b7ad98 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Thu, 24 Aug 2023 13:00:13 -0400 -Subject: [PATCH 1/9] Source: Link libatomic when needed on any Linux - architecture -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Extend commit 78bbd58545 (Source: Link libatomic when needed on Linux -32-bit ARM, 2023-07-27, v3.27.2~10^2) to check for libatomic on more -architectures. - -Fixes: #25204 -Signed-off-by: Björn Esser ---- - Source/Checks/cm_cxx_features.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake -index 98d5eff072..02627464cc 100644 ---- a/Source/Checks/cm_cxx_features.cmake -+++ b/Source/Checks/cm_cxx_features.cmake -@@ -96,7 +96,7 @@ else() - set(CMake_HAVE_CXX_FILESYSTEM FALSE) - endif() - --if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "armv7l|sparc") -+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|aarch64)$") - cm_check_cxx_feature(atomic_builtin) - if(NOT CMake_HAVE_CXX_ATOMIC_BUILTIN) - set(cm_check_cxx_feature_LINK_LIBRARIES atomic) --- -2.41.0 - diff --git a/0002-Help-MSVC_DEBUG_INFORMATION_FORMAT-is-initialized-fr.patch b/0002-Help-MSVC_DEBUG_INFORMATION_FORMAT-is-initialized-fr.patch deleted file mode 100644 index 57da3aa..0000000 --- a/0002-Help-MSVC_DEBUG_INFORMATION_FORMAT-is-initialized-fr.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 91dc94c4aca611865bf5cb4e9fec6b3422d1de9a Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Tue, 5 Sep 2023 14:54:04 -0400 -Subject: [PATCH 2/9] Help: MSVC_DEBUG_INFORMATION_FORMAT is initialized from - associated variable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The `CMAKE_MSVC_DEBUG_INFORMATION_FORMAT` variable docs mention that it -initializes the `MSVC_DEBUG_INFORMATION_FORMAT` target property, but the -property's docs was missing any mention of the variable. - -Follow the pattern from commit c1b07ca9da (Help: MSVC_RUNTIME_LIBRARY is -initialized from associated variable, 2022-08-13, v3.25.0-rc1~317^2). - -Fixes: #25216 -Signed-off-by: Björn Esser ---- - Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst b/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst -index 0c7845ce4a..7e08b483c4 100644 ---- a/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst -+++ b/Help/prop_tgt/MSVC_DEBUG_INFORMATION_FORMAT.rst -@@ -21,6 +21,8 @@ support per-configuration specification. For example, the code: - selects for the target ``foo`` the program database debug information format - for the Debug configuration. - -+This property is initialized from the value of the -+:variable:`CMAKE_MSVC_DEBUG_INFORMATION_FORMAT` variable, if it is set. - If this property is not set, CMake selects a debug information format using - the default value ``$<$:ProgramDatabase>``, if - supported by the compiler, and otherwise --- -2.41.0 - diff --git a/0003-cmGeneratorTarget-support-config-independent-Fortran.patch b/0003-cmGeneratorTarget-support-config-independent-Fortran.patch deleted file mode 100644 index 42f0976..0000000 --- a/0003-cmGeneratorTarget-support-config-independent-Fortran.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 6251edaed1c4f55625d96dc31e044a9fd23e1db2 Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -Date: Tue, 5 Sep 2023 15:55:19 -0400 -Subject: [PATCH 3/9] cmGeneratorTarget: support config-independent Fortran - source queries -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some locations care about "any config with Fortran", so make a query for -such (they may not know any configuration names themselves). - -Signed-off-by: Björn Esser ---- - Source/cmGeneratorTarget.cxx | 9 +++++++++ - Source/cmGeneratorTarget.h | 1 + - 2 files changed, 10 insertions(+) - -diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx -index 357d0a66a1..7d1fcf3e5c 100644 ---- a/Source/cmGeneratorTarget.cxx -+++ b/Source/cmGeneratorTarget.cxx -@@ -8873,6 +8873,15 @@ bool cmGeneratorTarget::HaveFortranSources(std::string const& config) const - }); - } - -+bool cmGeneratorTarget::HaveFortranSources() const -+{ -+ auto sources = cmGeneratorTarget::GetAllConfigSources(); -+ return std::any_of(sources.begin(), sources.end(), -+ [](AllConfigSource const& sf) -> bool { -+ return sf.Source->GetLanguage() == "Fortran"_s; -+ }); -+} -+ - bool cmGeneratorTarget::HaveCxx20ModuleSources() const - { - auto const& fs_names = this->Target->GetAllFileSetNames(); -diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h -index 78945c3fa9..dca69fd001 100644 ---- a/Source/cmGeneratorTarget.h -+++ b/Source/cmGeneratorTarget.h -@@ -1247,6 +1247,7 @@ public: - cmGeneratorTarget const* t2) const; - }; - -+ bool HaveFortranSources() const; - bool HaveFortranSources(std::string const& config) const; - - // C++20 module support queries. --- -2.41.0 - diff --git a/0004-cmComputeLinkInformation-compute-link-info-for-modul.patch b/0004-cmComputeLinkInformation-compute-link-info-for-modul.patch deleted file mode 100644 index 70e271a..0000000 --- a/0004-cmComputeLinkInformation-compute-link-info-for-modul.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 74b1d6caf31d9921b8311012ead4497865e77396 Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -Date: Tue, 5 Sep 2023 15:56:03 -0400 -Subject: [PATCH 4/9] cmComputeLinkInformation: compute link info for - module-using targets -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Targets which contain C++ module or Fortran sources need to participate -in link information unconditionally regardless of whether they actually -have link artifacts or not. - -Fixes: #25223 -Signed-off-by: Björn Esser ---- - Source/cmComputeLinkInformation.cxx | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx -index ebbb88f6a2..4804565840 100644 ---- a/Source/cmComputeLinkInformation.cxx -+++ b/Source/cmComputeLinkInformation.cxx -@@ -533,11 +533,14 @@ cmComputeLinkInformation::GetObjectLibrariesLinked() const - - bool cmComputeLinkInformation::Compute() - { -- // Skip targets that do not link. -+ // Skip targets that do not link or have link-like information consumers may -+ // need (namely modules). - if (!(this->Target->GetType() == cmStateEnums::EXECUTABLE || - this->Target->GetType() == cmStateEnums::SHARED_LIBRARY || - this->Target->GetType() == cmStateEnums::MODULE_LIBRARY || -- this->Target->GetType() == cmStateEnums::STATIC_LIBRARY)) { -+ this->Target->GetType() == cmStateEnums::STATIC_LIBRARY || -+ this->Target->HaveCxx20ModuleSources() || -+ this->Target->HaveFortranSources())) { - return false; - } - --- -2.41.0 - diff --git a/0005-ctest-Restore-support-for-http-redirects-during-Subm.patch b/0005-ctest-Restore-support-for-http-redirects-during-Subm.patch deleted file mode 100644 index 6cf4d50..0000000 --- a/0005-ctest-Restore-support-for-http-redirects-during-Subm.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 26ce8dc290710ddbad49335f36968d850176b634 Mon Sep 17 00:00:00 2001 -From: Zack Galbreath -Date: Thu, 7 Sep 2023 12:12:30 -0400 -Subject: [PATCH 5/9] ctest: Restore support for http redirects during Submit - step -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -After CDash PR 1519 introduced HTTP status codes greater than 200 for -various error cases, CMake commit b7c871f745 (ctest: Update ctest_submit -for CDash behavior change, 2023-07-24, v3.27.1~3^2) modified CTest's -submit handler to check the status returned by CDash and throw an error -when this status is not equal to 200. - -That change had the unintended side effect of causing CTest submissions -to fail when uploading results to a URL that returns a redirect status -code (3xx). Fix this by configuring cURL to follow the redirect. The -status cURL reports to CTest is now 200 instead of 3xx when CDash is -located behind a redirect. - -Fixes: #25159 -Signed-off-by: Björn Esser ---- - Source/CTest/cmCTestSubmitHandler.cxx | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx -index 7d4b0a847c..c04f23a1fe 100644 ---- a/Source/CTest/cmCTestSubmitHandler.cxx -+++ b/Source/CTest/cmCTestSubmitHandler.cxx -@@ -309,6 +309,9 @@ bool cmCTestSubmitHandler::SubmitUsingHTTP( - // specify target - ::curl_easy_setopt(curl, CURLOPT_URL, upload_as.c_str()); - -+ // follow redirects -+ ::curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); -+ - // CURLAUTH_BASIC is default, and here we allow additional methods, - // including more secure ones - ::curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); --- -2.41.0 - diff --git a/0006-FortranCInterface-forward-CMAKE_OSX_DEPLOYMENT_TARGE.patch b/0006-FortranCInterface-forward-CMAKE_OSX_DEPLOYMENT_TARGE.patch deleted file mode 100644 index 34ecef3..0000000 --- a/0006-FortranCInterface-forward-CMAKE_OSX_DEPLOYMENT_TARGE.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 84a097f0388f8fbf86aeada640f56132e3776335 Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -Date: Sun, 10 Sep 2023 21:10:27 -0400 -Subject: [PATCH 6/9] FortranCInterface: forward `CMAKE_OSX_DEPLOYMENT_TARGET` -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC needs to be taught about every macOS release it seems, so older -builds may not support usage on newer releases by default. - -Signed-off-by: Björn Esser ---- - Modules/FortranCInterface.cmake | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Modules/FortranCInterface.cmake b/Modules/FortranCInterface.cmake -index 2c85029ed4..81481a7ba7 100644 ---- a/Modules/FortranCInterface.cmake -+++ b/Modules/FortranCInterface.cmake -@@ -374,6 +374,7 @@ function(FortranCInterface_VERIFY) - "-DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}" - "-DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE}" - "-DFortranCInterface_BINARY_DIR=${FortranCInterface_BINARY_DIR}" -+ "-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}" - ${_FortranCInterface_OSX_ARCH} - ${_FortranCInterface_EXE_LINKER_FLAGS} - OUTPUT_VARIABLE _output) --- -2.41.0 - diff --git a/0007-FindBoost-Add-support-for-Boost-1.83.patch b/0007-FindBoost-Add-support-for-Boost-1.83.patch deleted file mode 100644 index 16a43cf..0000000 --- a/0007-FindBoost-Add-support-for-Boost-1.83.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 897a149067b84375d094700632255c0b54f5e44c Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Mon, 11 Sep 2023 09:50:54 -0400 -Subject: [PATCH 7/9] FindBoost: Add support for Boost 1.83 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Update the list of known versions. - -Run the command - - cmake -DBOOST_DIR=/path/to/boost_1_83_0 \ - -P Utilities/Scripts/BoostScanDeps.cmake - -to extract dependencies from the 1.83.0 source tree. - -Dependencies differ from 1.82, as mentioned in the 1.83 release notes: - -* Boost.Timer no longer depends on Boost.Chrono - -Fixes: #25243 -Signed-off-by: Björn Esser ---- - Modules/FindBoost.cmake | 20 +++++++++++++++++--- - 1 file changed, 17 insertions(+), 3 deletions(-) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index f2e4804d04..1f82bb52a1 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -1365,7 +1365,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - set(_Boost_TIMER_DEPENDENCIES chrono) - set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) - set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) -- else() -+ elseif(Boost_VERSION_STRING VERSION_LESS 1.83.0) - set(_Boost_CONTRACT_DEPENDENCIES thread chrono) - set(_Boost_COROUTINE_DEPENDENCIES context) - set(_Boost_FIBER_DEPENDENCIES context) -@@ -1380,7 +1380,21 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) - set(_Boost_TIMER_DEPENDENCIES chrono) - set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) - set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) -- if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.83.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) -+ else() -+ set(_Boost_CONTRACT_DEPENDENCIES thread chrono) -+ set(_Boost_COROUTINE_DEPENDENCIES context) -+ set(_Boost_FIBER_DEPENDENCIES context) -+ set(_Boost_IOSTREAMS_DEPENDENCIES regex) -+ set(_Boost_JSON_DEPENDENCIES container) -+ set(_Boost_LOG_DEPENDENCIES log_setup filesystem thread regex chrono atomic) -+ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l) -+ set(_Boost_MPI_DEPENDENCIES serialization) -+ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization) -+ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version}) -+ set(_Boost_THREAD_DEPENDENCIES chrono atomic) -+ set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono atomic) -+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) -+ if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.84.0 AND NOT Boost_NO_WARN_NEW_VERSIONS) - message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") - endif() - endif() -@@ -1655,7 +1669,7 @@ else() - # _Boost_COMPONENT_HEADERS. See the instructions at the top of - # _Boost_COMPONENT_DEPENDENCIES. - set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} -- "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79" -+ "1.83.0" "1.83" "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80" "1.79.0" "1.79" - "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74" - "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" - "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" --- -2.41.0 - diff --git a/0008-VS-Avoid-unnecessary-CUDA-device-linking-for-OBJECT-.patch b/0008-VS-Avoid-unnecessary-CUDA-device-linking-for-OBJECT-.patch deleted file mode 100644 index 614e1d6..0000000 --- a/0008-VS-Avoid-unnecessary-CUDA-device-linking-for-OBJECT-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 6ebff6ebf8850a9372786bf56af8ee79dca6860d Mon Sep 17 00:00:00 2001 -From: Robert Maynard -Date: Mon, 11 Sep 2023 15:54:53 -0400 -Subject: [PATCH 8/9] VS: Avoid unnecessary CUDA device linking for OBJECT - libraries -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without `CudaLink` fields, MSBuild tries to perform a device link step -for object libraries with CUDA_SEPARABLE_COMPILATION on them even when -not needed. This commonly was encountered when generating PTX or -OPTIX-IR output. - -Signed-off-by: Björn Esser ---- - Source/cmVisualStudio10TargetGenerator.cxx | 5 ++++- - Tests/CudaOnly/Fatbin/CMakeLists.txt | 1 + - Tests/CudaOnly/OptixIR/CMakeLists.txt | 1 + - 3 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx -index b3699ae739..b011615097 100644 ---- a/Source/cmVisualStudio10TargetGenerator.cxx -+++ b/Source/cmVisualStudio10TargetGenerator.cxx -@@ -3855,7 +3855,10 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaLinkOptions( - void cmVisualStudio10TargetGenerator::WriteCudaLinkOptions( - Elem& e1, std::string const& configName) - { -- if (this->GeneratorTarget->GetType() > cmStateEnums::MODULE_LIBRARY) { -+ // We need to write link options for OBJECT libraries so that -+ // we override the default device link behavior ( enabled ) when -+ // building object libraries with ptx/optix-ir/etc -+ if (this->GeneratorTarget->GetType() > cmStateEnums::OBJECT_LIBRARY) { - return; - } - -diff --git a/Tests/CudaOnly/Fatbin/CMakeLists.txt b/Tests/CudaOnly/Fatbin/CMakeLists.txt -index db0dc227e0..99744044c1 100644 ---- a/Tests/CudaOnly/Fatbin/CMakeLists.txt -+++ b/Tests/CudaOnly/Fatbin/CMakeLists.txt -@@ -10,6 +10,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../CUBIN/kernelB.cu - ${CMAKE_CURRENT_SOURCE_DIR}/../CUBIN/kernelC.cu) - - set_property(TARGET CudaFATBIN PROPERTY CUDA_FATBIN_COMPILATION ON) -+set_property(TARGET CudaFATBIN PROPERTY CUDA_SEPARABLE_COMPILATION ON) - - # Will use `cuModuleLoadFatBinary` to load the fatbinaries - add_executable(CudaOnlyFatbin main.cu) -diff --git a/Tests/CudaOnly/OptixIR/CMakeLists.txt b/Tests/CudaOnly/OptixIR/CMakeLists.txt -index afeabdade7..f408d40325 100644 ---- a/Tests/CudaOnly/OptixIR/CMakeLists.txt -+++ b/Tests/CudaOnly/OptixIR/CMakeLists.txt -@@ -13,6 +13,7 @@ if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "11.7.0") - set_property(TARGET CudaOptix PROPERTY CUDA_OPTIX_COMPILATION ON) - endif() - -+set_property(TARGET CudaOptix PROPERTY CUDA_SEPARABLE_COMPILATION ON) - set_property(TARGET CudaOptix PROPERTY CUDA_ARCHITECTURES native) - - add_executable(CudaOnlyOptixIR main.cu) --- -2.41.0 - diff --git a/0009-Autogen-Evaluate-INTERFACE_AUTOMOC_MACRO_NAMES-effic.patch b/0009-Autogen-Evaluate-INTERFACE_AUTOMOC_MACRO_NAMES-effic.patch deleted file mode 100644 index c368c8b..0000000 --- a/0009-Autogen-Evaluate-INTERFACE_AUTOMOC_MACRO_NAMES-effic.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 42adf3cba82c1f375d7a75a76697e674fd6f1b2f Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Tue, 12 Sep 2023 13:50:16 -0400 -Subject: [PATCH 9/9] Autogen: Evaluate INTERFACE_AUTOMOC_MACRO_NAMES - efficiently -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In commit c5c3aff1f5 (Autogen: Add INTERFACE_AUTOMOC_MACRO_NAMES target -property, 2023-04-03, v3.27.0-rc1~197^2) we forgot to mark the property -as a usage requirement. This is needed for efficient evaluation over -the target dependency closure. - -Fixes: #25238 -Signed-off-by: Björn Esser ---- - Source/cmGeneratorExpressionDAGChecker.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Source/cmGeneratorExpressionDAGChecker.h b/Source/cmGeneratorExpressionDAGChecker.h -index 1919b014e5..782d6c8b7d 100644 ---- a/Source/cmGeneratorExpressionDAGChecker.h -+++ b/Source/cmGeneratorExpressionDAGChecker.h -@@ -23,6 +23,7 @@ class cmGeneratorTarget; - SELECT(F, EvaluatingSystemIncludeDirectories, SYSTEM_INCLUDE_DIRECTORIES) \ - SELECT(F, EvaluatingCompileDefinitions, COMPILE_DEFINITIONS) \ - SELECT(F, EvaluatingCompileOptions, COMPILE_OPTIONS) \ -+ SELECT(F, EvaluatingAutoMocMacroNames, AUTOMOC_MACRO_NAMES) \ - SELECT(F, EvaluatingAutoUicOptions, AUTOUIC_OPTIONS) \ - SELECT(F, EvaluatingSources, SOURCES) \ - SELECT(F, EvaluatingCompileFeatures, COMPILE_FEATURES) \ --- -2.41.0 - diff --git a/cmake.spec b/cmake.spec index f84e042..681a243 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,10 +69,10 @@ %global major_version 3 %global minor_version 27 -%global patch_version 4 +%global patch_version 5 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 9 +%global baserelease 1 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -123,16 +123,6 @@ Patch100: %{name}-findruby.patch Patch1: %{name}-rename.patch %endif -Patch10001: 0001-Source-Link-libatomic-when-needed-on-any-Linux-archi.patch -Patch10002: 0002-Help-MSVC_DEBUG_INFORMATION_FORMAT-is-initialized-fr.patch -Patch10003: 0003-cmGeneratorTarget-support-config-independent-Fortran.patch -Patch10004: 0004-cmComputeLinkInformation-compute-link-info-for-modul.patch -Patch10005: 0005-ctest-Restore-support-for-http-redirects-during-Subm.patch -Patch10006: 0006-FortranCInterface-forward-CMAKE_OSX_DEPLOYMENT_TARGE.patch -Patch10007: 0007-FindBoost-Add-support-for-Boost-1.83.patch -Patch10008: 0008-VS-Avoid-unnecessary-CUDA-device-linking-for-OBJECT-.patch -Patch10009: 0009-Autogen-Evaluate-INTERFACE_AUTOMOC_MACRO_NAMES-effic.patch - BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc-c++ @@ -559,6 +549,10 @@ popd %changelog +* Fri Sep 15 2023 Björn Esser - 3.27.5-1 +- cmake-3.27.5 + Fixes rhbz#2239015 + * Fri Sep 15 2023 Björn Esser - 3.27.4-9 - Fix CI failure finally diff --git a/sources b/sources index 022d5e7..9e32a9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.4.tar.gz) = fc04b041f5c73b0a969ba09251e00e20f33e7a76460630d60e95ce08086c6b41b82315bd8782c19070b5f12a4290858825687f816b69ad5df8101053b4a2b48a +SHA512 (cmake-3.27.5.tar.gz) = db8f2929b956043a42e2cf73708f9435d427cff8f5d334d4631b67da8446c388c52960929d6e428496ca135758af315aad4adc8dc19268099dafc7a2e5a61d42 From e9463cc03de3aeeaead02cdb190c07b3b235d045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 27 Sep 2023 21:06:51 +0200 Subject: [PATCH 180/238] cmake-3.27.6, include new upstream patch Fixes rhbz#2239015, rhbz#2240311 --- 0001-Linting-Fix-empty-evaluated-genex.patch | 70 ++++++++++++++++++++ cmake.spec | 10 ++- sources | 2 +- 3 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 0001-Linting-Fix-empty-evaluated-genex.patch diff --git a/0001-Linting-Fix-empty-evaluated-genex.patch b/0001-Linting-Fix-empty-evaluated-genex.patch new file mode 100644 index 0000000..7d0eb28 --- /dev/null +++ b/0001-Linting-Fix-empty-evaluated-genex.patch @@ -0,0 +1,70 @@ +From 80df7b174506eb5c7d9db3e65e2ffb59b9e8f16d Mon Sep 17 00:00:00 2001 +From: Orkun Tokdemir +Date: Mon, 25 Sep 2023 14:50:59 +0200 +Subject: [PATCH] Linting: Fix empty evaluated genex +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Update logic added by commit 099934e313 (Add generator expression +support to static code analysis hooks, 2023-03-24, v3.27.0-rc1~261^2), +and preserved by commit 993dde925f (TargetGenerator: Factor out +generation of code check rules, 2023-05-12, v3.27.0-rc1~84^2~2), to +handle a generator expression that evaluates to the empty string. + +If `_CPPCHECK`, `_CPPLINT`, `_CLANG_TIDY`, or +`_INCLUDE_WHAT_YOU_USE` are empty after evaluating generator +expressions, do not run their lints. + +Fixes: #25265 +Signed-off-by: Björn Esser +--- + Source/cmCommonTargetGenerator.cxx | 5 +---- + Tests/RunCMake/MultiLint/RunCMakeTest.cmake | 1 + + Tests/RunCMake/MultiLint/genex.cmake | 6 ++++++ + 3 files changed, 8 insertions(+), 4 deletions(-) + create mode 100644 Tests/RunCMake/MultiLint/genex.cmake + +diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx +index 1924235dda..c781137669 100644 +--- a/Source/cmCommonTargetGenerator.cxx ++++ b/Source/cmCommonTargetGenerator.cxx +@@ -335,10 +335,7 @@ std::string cmCommonTargetGenerator::GenerateCodeCheckRules( + auto evaluatedProp = cmGeneratorExpression::Evaluate( + *value, this->GeneratorTarget->GetLocalGenerator(), config, + this->GeneratorTarget, nullptr, this->GeneratorTarget, lang); +- if (!evaluatedProp.empty()) { +- return evaluatedProp; +- } +- return *value; ++ return evaluatedProp; + }; + std::string const tidy_prop = cmStrCat(lang, "_CLANG_TIDY"); + tidy = evaluateProp(tidy_prop); +diff --git a/Tests/RunCMake/MultiLint/RunCMakeTest.cmake b/Tests/RunCMake/MultiLint/RunCMakeTest.cmake +index 9b7a6a9971..f2df29019b 100644 +--- a/Tests/RunCMake/MultiLint/RunCMakeTest.cmake ++++ b/Tests/RunCMake/MultiLint/RunCMakeTest.cmake +@@ -24,6 +24,7 @@ run_multilint(CXX) + if(NOT RunCMake_GENERATOR STREQUAL "Watcom WMake") + run_multilint(C-launch) + run_multilint(CXX-launch) ++ run_multilint(genex) + endif() + + function(run_skip_linting test_name) +diff --git a/Tests/RunCMake/MultiLint/genex.cmake b/Tests/RunCMake/MultiLint/genex.cmake +new file mode 100644 +index 0000000000..17f9248b00 +--- /dev/null ++++ b/Tests/RunCMake/MultiLint/genex.cmake +@@ -0,0 +1,6 @@ ++enable_language(CXX) ++set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "$,${PSEUDO_IWYU},>") ++set(CMAKE_CXX_CLANG_TIDY "$,${PSEUDO_TIDY} --error,>") ++set(CMAKE_CXX_CPPLINT "$,${PSEUDO_CPPLINT} --error,>") ++set(CMAKE_CXX_CPPCHECK "$,${PSEUDO_CPPCHECK} -bad,>") ++add_executable(main main.cxx) +-- +2.41.0 + diff --git a/cmake.spec b/cmake.spec index 681a243..6563be9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global major_version 3 %global minor_version 27 -%global patch_version 5 +%global patch_version 6 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -123,6 +123,9 @@ Patch100: %{name}-findruby.patch Patch1: %{name}-rename.patch %endif +# https://gitlab.kitware.com/cmake/cmake/-/issues/25265 +Patch10001: 0001-Linting-Fix-empty-evaluated-genex.patch + BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc-c++ @@ -549,6 +552,11 @@ popd %changelog +* Wed Sep 27 2023 Björn Esser - 3.27.6-1 +- cmake-3.27.6 + Fixes rhbz#2239015, rhbz#2240311 +- Include new upstream patch + * Fri Sep 15 2023 Björn Esser - 3.27.5-1 - cmake-3.27.5 Fixes rhbz#2239015 diff --git a/sources b/sources index 9e32a9c..ee8c9ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.5.tar.gz) = db8f2929b956043a42e2cf73708f9435d427cff8f5d334d4631b67da8446c388c52960929d6e428496ca135758af315aad4adc8dc19268099dafc7a2e5a61d42 +SHA512 (cmake-3.27.6.tar.gz) = 268b5bd84800c37ce0e311cadf13c275a538d612844cc8687107549fe6341a6c3115560e3b9162836843016213d225f62db130bc251bf8aff50c69b9bd58e638 From c12643cb55f12c9283c1df66771c704449d6ea33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 28 Sep 2023 01:45:56 +0200 Subject: [PATCH 181/238] tests/cmake-testsuite-sanity: Adapt directory regex to allow RC versions --- tests/cmake-testsuite-sanity/runtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh index ce77275..5853dbf 100755 --- a/tests/cmake-testsuite-sanity/runtest.sh +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -57,7 +57,7 @@ rlJournalStart rlRun "dnf builddep -y $TmpDir/SPECS/*.spec" rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/rpmbuild.log" - rlRun "CMakeDir=`ls $TmpDir/BUILD | grep -E '^cmake-[0-9]+\.[0-9]+\.[0-9]+$' | tail -n 1`" + rlRun "CMakeDir=`ls $TmpDir/BUILD | grep -E '^cmake-[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$' | tail -n 1`" rlRun "cd $TmpDir/BUILD/$CMakeDir" rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/bootstrap.log" From b8b1ab716dd55658590efc7155032bdb267873d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 3 Oct 2023 16:32:06 +0200 Subject: [PATCH 182/238] Include new upstream patches --- 0001-Linting-Fix-empty-evaluated-genex.patch | 2 +- ...ndroid-Require-Clang-18-for-std-c-23.patch | 59 ++++++++++++ ...rify-RunCMake.CTestTimeout-case-name.patch | 43 +++++++++ ...pport-for-timeout-values-higher-than.patch | 93 +++++++++++++++++++ ...P0124-behavior-on-already-set-variab.patch | 76 +++++++++++++++ ...ostgreSQL-Add-support-for-version-16.patch | 39 ++++++++ cmake.spec | 11 ++- 7 files changed, 320 insertions(+), 3 deletions(-) create mode 100644 0002-Android-Require-Clang-18-for-std-c-23.patch create mode 100644 0003-Tests-Clarify-RunCMake.CTestTimeout-case-name.patch create mode 100644 0004-ctest-Restore-support-for-timeout-values-higher-than.patch create mode 100644 0005-Help-Document-CMP0124-behavior-on-already-set-variab.patch create mode 100644 0006-FindPostgreSQL-Add-support-for-version-16.patch diff --git a/0001-Linting-Fix-empty-evaluated-genex.patch b/0001-Linting-Fix-empty-evaluated-genex.patch index 7d0eb28..4ec6256 100644 --- a/0001-Linting-Fix-empty-evaluated-genex.patch +++ b/0001-Linting-Fix-empty-evaluated-genex.patch @@ -1,7 +1,7 @@ From 80df7b174506eb5c7d9db3e65e2ffb59b9e8f16d Mon Sep 17 00:00:00 2001 From: Orkun Tokdemir Date: Mon, 25 Sep 2023 14:50:59 +0200 -Subject: [PATCH] Linting: Fix empty evaluated genex +Subject: [PATCH 1/6] Linting: Fix empty evaluated genex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/0002-Android-Require-Clang-18-for-std-c-23.patch b/0002-Android-Require-Clang-18-for-std-c-23.patch new file mode 100644 index 0000000..1f5bf0c --- /dev/null +++ b/0002-Android-Require-Clang-18-for-std-c-23.patch @@ -0,0 +1,59 @@ +From 75e9918a669666b16e7819b384c50858ea9d868b Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Wed, 27 Sep 2023 12:15:27 -0400 +Subject: [PATCH 2/6] Android: Require Clang 18 for -std=c++23 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Update the Clang version checks added by + +* commit eacacc70fc (Clang: use -std=c++23 for Clang 17.0+, + 2023-05-08, v3.27.0-rc1~115^2) +* commit 0183956d30 (Clang: C++26 support, + 2023-05-16, v3.27.0-rc1~85^2) + +to account for Android NDK r26's distribution of a Clang based on a +development version of LLVM/Clang 17.0 that pre-dated addition of +these flags. + +Follow the pattern from commit 12e6796b62 (Android: Do not pass +non-existent Clang -std flags, 2018-04-02, v3.12.0-rc1~284^2), +which fixed the same problem for `-std=c++17`. + +Fixes: #25281 +Signed-off-by: Björn Esser +--- + Modules/Compiler/Clang.cmake | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake +index 46f5fc1941..e5683c2c03 100644 +--- a/Modules/Compiler/Clang.cmake ++++ b/Modules/Compiler/Clang.cmake +@@ -173,7 +173,12 @@ macro(__compiler_clang_cxx_standards lang) + + unset(_clang_version_std17) + +- if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 17.0) ++ set(_clang_version_std23 17.0) ++ if(CMAKE_SYSTEM_NAME STREQUAL "Android") ++ set(_clang_version_std23 18.0) ++ endif() ++ ++ if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS "${_clang_version_std23}") + set(CMAKE_${lang}23_STANDARD_COMPILE_OPTION "-std=c++23") + set(CMAKE_${lang}23_EXTENSION_COMPILE_OPTION "-std=gnu++23") + set(CMAKE_${lang}26_STANDARD_COMPILE_OPTION "-std=c++26") +@@ -183,6 +188,8 @@ macro(__compiler_clang_cxx_standards lang) + set(CMAKE_${lang}23_EXTENSION_COMPILE_OPTION "-std=gnu++2b") + endif() + ++ unset(_clang_version_std23) ++ + if("x${CMAKE_${lang}_SIMULATE_ID}" STREQUAL "xMSVC") + # The MSVC standard library requires C++14, and MSVC itself has no + # notion of operating in a mode not aware of at least that standard. +-- +2.41.0 + diff --git a/0003-Tests-Clarify-RunCMake.CTestTimeout-case-name.patch b/0003-Tests-Clarify-RunCMake.CTestTimeout-case-name.patch new file mode 100644 index 0000000..90eadb5 --- /dev/null +++ b/0003-Tests-Clarify-RunCMake.CTestTimeout-case-name.patch @@ -0,0 +1,43 @@ +From dd779a4bc2f1b845a03b00885cd33ed2cc8adac3 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Fri, 29 Sep 2023 08:54:51 -0400 +Subject: [PATCH 3/6] Tests: Clarify RunCMake.CTestTimeout case name +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Björn Esser +--- + ...erridesScript-stdout.txt => PropertyOverridesVar-stdout.txt} | 2 +- + Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + rename Tests/RunCMake/CTestTimeout/{PropertyOverridesScript-stdout.txt => PropertyOverridesVar-stdout.txt} (72%) + +diff --git a/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt b/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt +similarity index 72% +rename from Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt +rename to Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt +index 6e46485759..aeeb3c9c39 100644 +--- a/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt ++++ b/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt +@@ -1,5 +1,5 @@ + Test project [^ +-]*/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-build ++]*/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-build + Start 1: TestTimeout + 1/1 Test #1: TestTimeout ...................... Passed +[1-9][0-9.]* sec + + +diff --git a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake +index 2f9eda121d..e9ecc5f20d 100644 +--- a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake ++++ b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake +@@ -92,5 +92,5 @@ block() + set(TIMEOUT 4) + set(CASE_TEST_PREFIX_CODE "set(CTEST_TEST_TIMEOUT 2)") + set(CASE_CMAKELISTS_SUFFIX_CODE "set_property(TEST TestTimeout PROPERTY TIMEOUT 10)\n") +- run_ctest_timeout(PropertyOverridesScript) ++ run_ctest_timeout(PropertyOverridesVar) + endblock() +-- +2.41.0 + diff --git a/0004-ctest-Restore-support-for-timeout-values-higher-than.patch b/0004-ctest-Restore-support-for-timeout-values-higher-than.patch new file mode 100644 index 0000000..5b7abfe --- /dev/null +++ b/0004-ctest-Restore-support-for-timeout-values-higher-than.patch @@ -0,0 +1,93 @@ +From d267c128a232e9beb99576f901ee1b9291ba1480 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Fri, 29 Sep 2023 09:00:30 -0400 +Subject: [PATCH 4/6] ctest: Restore support for --timeout values higher than + default test timeout +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since refactoring in commit 0a5aeaf302 (cmCTestRunTest: Consolidate test +timeout selection logic, 2023-05-04, v3.27.0-rc1~120^2) we accidentally +truncate `--timeout` values to ctest's default `TimeOut`. Fix the +logic to prefer the flag whenever the `TIMEOUT` property is not set. + +In combination with the prior refactoring, this also fixes a bug that +caused `--timeout` values of 10000000 seconds or more to be ignored. + +Fixes: #23979 +Signed-off-by: Björn Esser +--- + Help/manual/ctest.1.rst | 3 ++- + Source/CTest/cmCTestRunTest.cxx | 11 ++++++----- + .../RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt | 6 ++++++ + Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake | 7 +++++++ + 4 files changed, 21 insertions(+), 6 deletions(-) + create mode 100644 Tests/RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt + +diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst +index 994ae47b77..5c3889e3be 100644 +--- a/Help/manual/ctest.1.rst ++++ b/Help/manual/ctest.1.rst +@@ -1230,7 +1230,8 @@ Configuration settings include: + + ``TimeOut`` + The default timeout for each test if not specified by the +- :prop_test:`TIMEOUT` test property. ++ :prop_test:`TIMEOUT` test property or the ++ :option:`--timeout ` flag. + + * `CTest Script`_ variable: :variable:`CTEST_TEST_TIMEOUT` + * :module:`CTest` module variable: ``DART_TESTING_TIMEOUT`` +diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx +index 563439acda..19e505fcfe 100644 +--- a/Source/CTest/cmCTestRunTest.cxx ++++ b/Source/CTest/cmCTestRunTest.cxx +@@ -768,11 +768,12 @@ bool cmCTestRunTest::ForkProcess() + timeout = this->CTest->GetGlobalTimeout(); + } + +- // Check CTEST_TEST_TIMEOUT. +- cmDuration ctestTestTimeout = this->CTest->GetTimeOut(); +- if (ctestTestTimeout > cmDuration::zero() && +- (!timeout || ctestTestTimeout < *timeout)) { +- timeout = ctestTestTimeout; ++ if (!timeout) { ++ // Check CTEST_TEST_TIMEOUT. ++ cmDuration ctestTestTimeout = this->CTest->GetTimeOut(); ++ if (ctestTestTimeout > cmDuration::zero()) { ++ timeout = ctestTestTimeout; ++ } + } + } + +diff --git a/Tests/RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt b/Tests/RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt +new file mode 100644 +index 0000000000..f580871638 +--- /dev/null ++++ b/Tests/RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt +@@ -0,0 +1,6 @@ ++Test project [^ ++]*/Tests/RunCMake/CTestTimeout/FlagOverridesVar-build ++ Start 1: TestTimeout ++1/1 Test #1: TestTimeout ...................... Passed +[1-9][0-9.]* sec +++ ++100% tests passed, 0 tests failed out of 1 +diff --git a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake +index e9ecc5f20d..470bbd890d 100644 +--- a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake ++++ b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake +@@ -94,3 +94,10 @@ block() + set(CASE_CMAKELISTS_SUFFIX_CODE "set_property(TEST TestTimeout PROPERTY TIMEOUT 10)\n") + run_ctest_timeout(PropertyOverridesVar) + endblock() ++ ++block() ++ set(TIMEOUT 4) ++ set(CASE_TEST_PREFIX_CODE "set(CTEST_TEST_TIMEOUT 2)") ++ set(CASE_CMAKELISTS_SUFFIX_CODE "set_property(TEST TestTimeout PROPERTY TIMEOUT)\n") ++ run_ctest_timeout(FlagOverridesVar --timeout 10000001) ++endblock() +-- +2.41.0 + diff --git a/0005-Help-Document-CMP0124-behavior-on-already-set-variab.patch b/0005-Help-Document-CMP0124-behavior-on-already-set-variab.patch new file mode 100644 index 0000000..5ecc99f --- /dev/null +++ b/0005-Help-Document-CMP0124-behavior-on-already-set-variab.patch @@ -0,0 +1,76 @@ +From 55bf2a34948a01329f075d2da692c0eba49d45f4 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Fri, 29 Sep 2023 10:10:39 -0400 +Subject: [PATCH 5/6] Help: Document CMP0124 behavior on already-set variables +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Improve the documentation from commit 46896d98bb (foreach(): loop +variables are only available in the loop scope, 2021-04-25, +v3.21.0-rc1~245^2) to follow policy documentation convention. + +Fixes: #25224 +Inspired-by: Marius Messerschmidt +Signed-off-by: Björn Esser +--- + Help/policy/CMP0124.rst | 42 ++++++++++++++++++++++++++++++++++++----- + 1 file changed, 37 insertions(+), 5 deletions(-) + +diff --git a/Help/policy/CMP0124.rst b/Help/policy/CMP0124.rst +index 3935166ad5..d5cde64d42 100644 +--- a/Help/policy/CMP0124.rst ++++ b/Help/policy/CMP0124.rst +@@ -3,12 +3,44 @@ CMP0124 + + .. versionadded:: 3.21 + +-When this policy is set to ``NEW``, the scope of loop variables defined by the +-:command:`foreach` command is restricted to the loop only. They will be unset +-at the end of the loop. ++:command:`foreach` loop variables are only available in the loop scope. + +-The ``OLD`` behavior for this policy still clears the loop variables at the end +-of the loop, but does not unset them. This leaves them as defined, but empty. ++CMake 3.20 and below always leave the loop variable set at the end of the ++loop, either to the value it had before the loop, if any, or to the empty ++string. CMake 3.21 and above prefer to leave the loop variable in the ++state it had before the loop started, either set or unset. This policy ++provides compatibility for projects that expect the loop variable to always ++be left set. ++ ++The ``OLD`` behavior for this policy is to set the loop variable at the ++end of the loop, either to its original value, or to an empty value. ++The ``NEW`` behavior for this policy is to restore the loop variable to ++the state it had before the loop started, either set or unset. ++ ++For example: ++ ++.. code-block:: cmake ++ ++ set(items a b c) ++ ++ set(var1 "value") ++ unset(var2) ++ ++ foreach(var1 IN LISTS items) ++ endforeach() ++ ++ foreach(var2 IN LISTS items) ++ endforeach() ++ ++ if(DEFINED var1) ++ message("var1: ${var1}") ++ endif() ++ if(DEFINED var2) ++ message("var2: ${var2}") ++ endif() ++ ++Under the ``OLD`` behavior, this code prints ``var1: value`` and ``var2:``. ++Under the ``NEW`` behavior, this code prints only ``var1: value``. + + This policy was introduced in CMake version 3.21. Use the + :command:`cmake_policy` command to set it to ``OLD`` or ``NEW`` explicitly. +-- +2.41.0 + diff --git a/0006-FindPostgreSQL-Add-support-for-version-16.patch b/0006-FindPostgreSQL-Add-support-for-version-16.patch new file mode 100644 index 0000000..6633565 --- /dev/null +++ b/0006-FindPostgreSQL-Add-support-for-version-16.patch @@ -0,0 +1,39 @@ +From 25644a78de165af0cb6373e3ca103a93971041eb Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Mon, 2 Oct 2023 14:43:30 -0400 +Subject: [PATCH 6/6] FindPostgreSQL: Add support for version 16 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes: #25292 +Signed-off-by: Björn Esser +--- + Modules/FindPostgreSQL.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake +index 6e970e8432..84bc1ed2bf 100644 +--- a/Modules/FindPostgreSQL.cmake ++++ b/Modules/FindPostgreSQL.cmake +@@ -53,7 +53,7 @@ is set regardless of the presence of the ``Server`` component in find_package ca + # In Windows the default installation of PostgreSQL uses that as part of the path. + # E.g C:\Program Files\PostgreSQL\8.4. + # Currently, the following version numbers are known to this module: +-# "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0" ++# "16" "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0" + # + # To use this variable just do something like this: + # set(PostgreSQL_ADDITIONAL_VERSIONS "9.2" "8.4.4") +@@ -102,7 +102,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher + + + set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} +- "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") ++ "16" "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") + + # Define additional search paths for root directories. + set( PostgreSQL_ROOT_DIRECTORIES +-- +2.41.0 + diff --git a/cmake.spec b/cmake.spec index 6563be9..2f709bf 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 6 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -123,8 +123,12 @@ Patch100: %{name}-findruby.patch Patch1: %{name}-rename.patch %endif -# https://gitlab.kitware.com/cmake/cmake/-/issues/25265 Patch10001: 0001-Linting-Fix-empty-evaluated-genex.patch +Patch10002: 0002-Android-Require-Clang-18-for-std-c-23.patch +Patch10003: 0003-Tests-Clarify-RunCMake.CTestTimeout-case-name.patch +Patch10004: 0004-ctest-Restore-support-for-timeout-values-higher-than.patch +Patch10005: 0005-Help-Document-CMP0124-behavior-on-already-set-variab.patch +Patch10006: 0006-FindPostgreSQL-Add-support-for-version-16.patch BuildRequires: coreutils BuildRequires: findutils @@ -552,6 +556,9 @@ popd %changelog +* Tue Oct 03 2023 Björn Esser - 3.27.6-2 +- Include new upstream patches + * Wed Sep 27 2023 Björn Esser - 3.27.6-1 - cmake-3.27.6 Fixes rhbz#2239015, rhbz#2240311 From e4497063d8fc85624ecd7f34ec086ef5b833e0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 7 Oct 2023 18:03:10 +0200 Subject: [PATCH 183/238] cmake-3.27.7 Fixes rhbz#2242491 --- 0001-Linting-Fix-empty-evaluated-genex.patch | 70 -------------- ...ndroid-Require-Clang-18-for-std-c-23.patch | 59 ------------ ...rify-RunCMake.CTestTimeout-case-name.patch | 43 --------- ...pport-for-timeout-values-higher-than.patch | 93 ------------------- ...P0124-behavior-on-already-set-variab.patch | 76 --------------- ...ostgreSQL-Add-support-for-version-16.patch | 39 -------- cmake.spec | 15 ++- sources | 2 +- 8 files changed, 7 insertions(+), 390 deletions(-) delete mode 100644 0001-Linting-Fix-empty-evaluated-genex.patch delete mode 100644 0002-Android-Require-Clang-18-for-std-c-23.patch delete mode 100644 0003-Tests-Clarify-RunCMake.CTestTimeout-case-name.patch delete mode 100644 0004-ctest-Restore-support-for-timeout-values-higher-than.patch delete mode 100644 0005-Help-Document-CMP0124-behavior-on-already-set-variab.patch delete mode 100644 0006-FindPostgreSQL-Add-support-for-version-16.patch diff --git a/0001-Linting-Fix-empty-evaluated-genex.patch b/0001-Linting-Fix-empty-evaluated-genex.patch deleted file mode 100644 index 4ec6256..0000000 --- a/0001-Linting-Fix-empty-evaluated-genex.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 80df7b174506eb5c7d9db3e65e2ffb59b9e8f16d Mon Sep 17 00:00:00 2001 -From: Orkun Tokdemir -Date: Mon, 25 Sep 2023 14:50:59 +0200 -Subject: [PATCH 1/6] Linting: Fix empty evaluated genex -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Update logic added by commit 099934e313 (Add generator expression -support to static code analysis hooks, 2023-03-24, v3.27.0-rc1~261^2), -and preserved by commit 993dde925f (TargetGenerator: Factor out -generation of code check rules, 2023-05-12, v3.27.0-rc1~84^2~2), to -handle a generator expression that evaluates to the empty string. - -If `_CPPCHECK`, `_CPPLINT`, `_CLANG_TIDY`, or -`_INCLUDE_WHAT_YOU_USE` are empty after evaluating generator -expressions, do not run their lints. - -Fixes: #25265 -Signed-off-by: Björn Esser ---- - Source/cmCommonTargetGenerator.cxx | 5 +---- - Tests/RunCMake/MultiLint/RunCMakeTest.cmake | 1 + - Tests/RunCMake/MultiLint/genex.cmake | 6 ++++++ - 3 files changed, 8 insertions(+), 4 deletions(-) - create mode 100644 Tests/RunCMake/MultiLint/genex.cmake - -diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx -index 1924235dda..c781137669 100644 ---- a/Source/cmCommonTargetGenerator.cxx -+++ b/Source/cmCommonTargetGenerator.cxx -@@ -335,10 +335,7 @@ std::string cmCommonTargetGenerator::GenerateCodeCheckRules( - auto evaluatedProp = cmGeneratorExpression::Evaluate( - *value, this->GeneratorTarget->GetLocalGenerator(), config, - this->GeneratorTarget, nullptr, this->GeneratorTarget, lang); -- if (!evaluatedProp.empty()) { -- return evaluatedProp; -- } -- return *value; -+ return evaluatedProp; - }; - std::string const tidy_prop = cmStrCat(lang, "_CLANG_TIDY"); - tidy = evaluateProp(tidy_prop); -diff --git a/Tests/RunCMake/MultiLint/RunCMakeTest.cmake b/Tests/RunCMake/MultiLint/RunCMakeTest.cmake -index 9b7a6a9971..f2df29019b 100644 ---- a/Tests/RunCMake/MultiLint/RunCMakeTest.cmake -+++ b/Tests/RunCMake/MultiLint/RunCMakeTest.cmake -@@ -24,6 +24,7 @@ run_multilint(CXX) - if(NOT RunCMake_GENERATOR STREQUAL "Watcom WMake") - run_multilint(C-launch) - run_multilint(CXX-launch) -+ run_multilint(genex) - endif() - - function(run_skip_linting test_name) -diff --git a/Tests/RunCMake/MultiLint/genex.cmake b/Tests/RunCMake/MultiLint/genex.cmake -new file mode 100644 -index 0000000000..17f9248b00 ---- /dev/null -+++ b/Tests/RunCMake/MultiLint/genex.cmake -@@ -0,0 +1,6 @@ -+enable_language(CXX) -+set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "$,${PSEUDO_IWYU},>") -+set(CMAKE_CXX_CLANG_TIDY "$,${PSEUDO_TIDY} --error,>") -+set(CMAKE_CXX_CPPLINT "$,${PSEUDO_CPPLINT} --error,>") -+set(CMAKE_CXX_CPPCHECK "$,${PSEUDO_CPPCHECK} -bad,>") -+add_executable(main main.cxx) --- -2.41.0 - diff --git a/0002-Android-Require-Clang-18-for-std-c-23.patch b/0002-Android-Require-Clang-18-for-std-c-23.patch deleted file mode 100644 index 1f5bf0c..0000000 --- a/0002-Android-Require-Clang-18-for-std-c-23.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 75e9918a669666b16e7819b384c50858ea9d868b Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Wed, 27 Sep 2023 12:15:27 -0400 -Subject: [PATCH 2/6] Android: Require Clang 18 for -std=c++23 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Update the Clang version checks added by - -* commit eacacc70fc (Clang: use -std=c++23 for Clang 17.0+, - 2023-05-08, v3.27.0-rc1~115^2) -* commit 0183956d30 (Clang: C++26 support, - 2023-05-16, v3.27.0-rc1~85^2) - -to account for Android NDK r26's distribution of a Clang based on a -development version of LLVM/Clang 17.0 that pre-dated addition of -these flags. - -Follow the pattern from commit 12e6796b62 (Android: Do not pass -non-existent Clang -std flags, 2018-04-02, v3.12.0-rc1~284^2), -which fixed the same problem for `-std=c++17`. - -Fixes: #25281 -Signed-off-by: Björn Esser ---- - Modules/Compiler/Clang.cmake | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/Modules/Compiler/Clang.cmake b/Modules/Compiler/Clang.cmake -index 46f5fc1941..e5683c2c03 100644 ---- a/Modules/Compiler/Clang.cmake -+++ b/Modules/Compiler/Clang.cmake -@@ -173,7 +173,12 @@ macro(__compiler_clang_cxx_standards lang) - - unset(_clang_version_std17) - -- if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 17.0) -+ set(_clang_version_std23 17.0) -+ if(CMAKE_SYSTEM_NAME STREQUAL "Android") -+ set(_clang_version_std23 18.0) -+ endif() -+ -+ if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS "${_clang_version_std23}") - set(CMAKE_${lang}23_STANDARD_COMPILE_OPTION "-std=c++23") - set(CMAKE_${lang}23_EXTENSION_COMPILE_OPTION "-std=gnu++23") - set(CMAKE_${lang}26_STANDARD_COMPILE_OPTION "-std=c++26") -@@ -183,6 +188,8 @@ macro(__compiler_clang_cxx_standards lang) - set(CMAKE_${lang}23_EXTENSION_COMPILE_OPTION "-std=gnu++2b") - endif() - -+ unset(_clang_version_std23) -+ - if("x${CMAKE_${lang}_SIMULATE_ID}" STREQUAL "xMSVC") - # The MSVC standard library requires C++14, and MSVC itself has no - # notion of operating in a mode not aware of at least that standard. --- -2.41.0 - diff --git a/0003-Tests-Clarify-RunCMake.CTestTimeout-case-name.patch b/0003-Tests-Clarify-RunCMake.CTestTimeout-case-name.patch deleted file mode 100644 index 90eadb5..0000000 --- a/0003-Tests-Clarify-RunCMake.CTestTimeout-case-name.patch +++ /dev/null @@ -1,43 +0,0 @@ -From dd779a4bc2f1b845a03b00885cd33ed2cc8adac3 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Fri, 29 Sep 2023 08:54:51 -0400 -Subject: [PATCH 3/6] Tests: Clarify RunCMake.CTestTimeout case name -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Björn Esser ---- - ...erridesScript-stdout.txt => PropertyOverridesVar-stdout.txt} | 2 +- - Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - rename Tests/RunCMake/CTestTimeout/{PropertyOverridesScript-stdout.txt => PropertyOverridesVar-stdout.txt} (72%) - -diff --git a/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt b/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt -similarity index 72% -rename from Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt -rename to Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt -index 6e46485759..aeeb3c9c39 100644 ---- a/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-stdout.txt -+++ b/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-stdout.txt -@@ -1,5 +1,5 @@ - Test project [^ --]*/Tests/RunCMake/CTestTimeout/PropertyOverridesScript-build -+]*/Tests/RunCMake/CTestTimeout/PropertyOverridesVar-build - Start 1: TestTimeout - 1/1 Test #1: TestTimeout ...................... Passed +[1-9][0-9.]* sec - + -diff --git a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake -index 2f9eda121d..e9ecc5f20d 100644 ---- a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake -+++ b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake -@@ -92,5 +92,5 @@ block() - set(TIMEOUT 4) - set(CASE_TEST_PREFIX_CODE "set(CTEST_TEST_TIMEOUT 2)") - set(CASE_CMAKELISTS_SUFFIX_CODE "set_property(TEST TestTimeout PROPERTY TIMEOUT 10)\n") -- run_ctest_timeout(PropertyOverridesScript) -+ run_ctest_timeout(PropertyOverridesVar) - endblock() --- -2.41.0 - diff --git a/0004-ctest-Restore-support-for-timeout-values-higher-than.patch b/0004-ctest-Restore-support-for-timeout-values-higher-than.patch deleted file mode 100644 index 5b7abfe..0000000 --- a/0004-ctest-Restore-support-for-timeout-values-higher-than.patch +++ /dev/null @@ -1,93 +0,0 @@ -From d267c128a232e9beb99576f901ee1b9291ba1480 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Fri, 29 Sep 2023 09:00:30 -0400 -Subject: [PATCH 4/6] ctest: Restore support for --timeout values higher than - default test timeout -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since refactoring in commit 0a5aeaf302 (cmCTestRunTest: Consolidate test -timeout selection logic, 2023-05-04, v3.27.0-rc1~120^2) we accidentally -truncate `--timeout` values to ctest's default `TimeOut`. Fix the -logic to prefer the flag whenever the `TIMEOUT` property is not set. - -In combination with the prior refactoring, this also fixes a bug that -caused `--timeout` values of 10000000 seconds or more to be ignored. - -Fixes: #23979 -Signed-off-by: Björn Esser ---- - Help/manual/ctest.1.rst | 3 ++- - Source/CTest/cmCTestRunTest.cxx | 11 ++++++----- - .../RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt | 6 ++++++ - Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake | 7 +++++++ - 4 files changed, 21 insertions(+), 6 deletions(-) - create mode 100644 Tests/RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt - -diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst -index 994ae47b77..5c3889e3be 100644 ---- a/Help/manual/ctest.1.rst -+++ b/Help/manual/ctest.1.rst -@@ -1230,7 +1230,8 @@ Configuration settings include: - - ``TimeOut`` - The default timeout for each test if not specified by the -- :prop_test:`TIMEOUT` test property. -+ :prop_test:`TIMEOUT` test property or the -+ :option:`--timeout ` flag. - - * `CTest Script`_ variable: :variable:`CTEST_TEST_TIMEOUT` - * :module:`CTest` module variable: ``DART_TESTING_TIMEOUT`` -diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx -index 563439acda..19e505fcfe 100644 ---- a/Source/CTest/cmCTestRunTest.cxx -+++ b/Source/CTest/cmCTestRunTest.cxx -@@ -768,11 +768,12 @@ bool cmCTestRunTest::ForkProcess() - timeout = this->CTest->GetGlobalTimeout(); - } - -- // Check CTEST_TEST_TIMEOUT. -- cmDuration ctestTestTimeout = this->CTest->GetTimeOut(); -- if (ctestTestTimeout > cmDuration::zero() && -- (!timeout || ctestTestTimeout < *timeout)) { -- timeout = ctestTestTimeout; -+ if (!timeout) { -+ // Check CTEST_TEST_TIMEOUT. -+ cmDuration ctestTestTimeout = this->CTest->GetTimeOut(); -+ if (ctestTestTimeout > cmDuration::zero()) { -+ timeout = ctestTestTimeout; -+ } - } - } - -diff --git a/Tests/RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt b/Tests/RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt -new file mode 100644 -index 0000000000..f580871638 ---- /dev/null -+++ b/Tests/RunCMake/CTestTimeout/FlagOverridesVar-stdout.txt -@@ -0,0 +1,6 @@ -+Test project [^ -+]*/Tests/RunCMake/CTestTimeout/FlagOverridesVar-build -+ Start 1: TestTimeout -+1/1 Test #1: TestTimeout ...................... Passed +[1-9][0-9.]* sec -++ -+100% tests passed, 0 tests failed out of 1 -diff --git a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake -index e9ecc5f20d..470bbd890d 100644 ---- a/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake -+++ b/Tests/RunCMake/CTestTimeout/RunCMakeTest.cmake -@@ -94,3 +94,10 @@ block() - set(CASE_CMAKELISTS_SUFFIX_CODE "set_property(TEST TestTimeout PROPERTY TIMEOUT 10)\n") - run_ctest_timeout(PropertyOverridesVar) - endblock() -+ -+block() -+ set(TIMEOUT 4) -+ set(CASE_TEST_PREFIX_CODE "set(CTEST_TEST_TIMEOUT 2)") -+ set(CASE_CMAKELISTS_SUFFIX_CODE "set_property(TEST TestTimeout PROPERTY TIMEOUT)\n") -+ run_ctest_timeout(FlagOverridesVar --timeout 10000001) -+endblock() --- -2.41.0 - diff --git a/0005-Help-Document-CMP0124-behavior-on-already-set-variab.patch b/0005-Help-Document-CMP0124-behavior-on-already-set-variab.patch deleted file mode 100644 index 5ecc99f..0000000 --- a/0005-Help-Document-CMP0124-behavior-on-already-set-variab.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 55bf2a34948a01329f075d2da692c0eba49d45f4 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Fri, 29 Sep 2023 10:10:39 -0400 -Subject: [PATCH 5/6] Help: Document CMP0124 behavior on already-set variables -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Improve the documentation from commit 46896d98bb (foreach(): loop -variables are only available in the loop scope, 2021-04-25, -v3.21.0-rc1~245^2) to follow policy documentation convention. - -Fixes: #25224 -Inspired-by: Marius Messerschmidt -Signed-off-by: Björn Esser ---- - Help/policy/CMP0124.rst | 42 ++++++++++++++++++++++++++++++++++++----- - 1 file changed, 37 insertions(+), 5 deletions(-) - -diff --git a/Help/policy/CMP0124.rst b/Help/policy/CMP0124.rst -index 3935166ad5..d5cde64d42 100644 ---- a/Help/policy/CMP0124.rst -+++ b/Help/policy/CMP0124.rst -@@ -3,12 +3,44 @@ CMP0124 - - .. versionadded:: 3.21 - --When this policy is set to ``NEW``, the scope of loop variables defined by the --:command:`foreach` command is restricted to the loop only. They will be unset --at the end of the loop. -+:command:`foreach` loop variables are only available in the loop scope. - --The ``OLD`` behavior for this policy still clears the loop variables at the end --of the loop, but does not unset them. This leaves them as defined, but empty. -+CMake 3.20 and below always leave the loop variable set at the end of the -+loop, either to the value it had before the loop, if any, or to the empty -+string. CMake 3.21 and above prefer to leave the loop variable in the -+state it had before the loop started, either set or unset. This policy -+provides compatibility for projects that expect the loop variable to always -+be left set. -+ -+The ``OLD`` behavior for this policy is to set the loop variable at the -+end of the loop, either to its original value, or to an empty value. -+The ``NEW`` behavior for this policy is to restore the loop variable to -+the state it had before the loop started, either set or unset. -+ -+For example: -+ -+.. code-block:: cmake -+ -+ set(items a b c) -+ -+ set(var1 "value") -+ unset(var2) -+ -+ foreach(var1 IN LISTS items) -+ endforeach() -+ -+ foreach(var2 IN LISTS items) -+ endforeach() -+ -+ if(DEFINED var1) -+ message("var1: ${var1}") -+ endif() -+ if(DEFINED var2) -+ message("var2: ${var2}") -+ endif() -+ -+Under the ``OLD`` behavior, this code prints ``var1: value`` and ``var2:``. -+Under the ``NEW`` behavior, this code prints only ``var1: value``. - - This policy was introduced in CMake version 3.21. Use the - :command:`cmake_policy` command to set it to ``OLD`` or ``NEW`` explicitly. --- -2.41.0 - diff --git a/0006-FindPostgreSQL-Add-support-for-version-16.patch b/0006-FindPostgreSQL-Add-support-for-version-16.patch deleted file mode 100644 index 6633565..0000000 --- a/0006-FindPostgreSQL-Add-support-for-version-16.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 25644a78de165af0cb6373e3ca103a93971041eb Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Mon, 2 Oct 2023 14:43:30 -0400 -Subject: [PATCH 6/6] FindPostgreSQL: Add support for version 16 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: #25292 -Signed-off-by: Björn Esser ---- - Modules/FindPostgreSQL.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Modules/FindPostgreSQL.cmake b/Modules/FindPostgreSQL.cmake -index 6e970e8432..84bc1ed2bf 100644 ---- a/Modules/FindPostgreSQL.cmake -+++ b/Modules/FindPostgreSQL.cmake -@@ -53,7 +53,7 @@ is set regardless of the presence of the ``Server`` component in find_package ca - # In Windows the default installation of PostgreSQL uses that as part of the path. - # E.g C:\Program Files\PostgreSQL\8.4. - # Currently, the following version numbers are known to this module: --# "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0" -+# "16" "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0" - # - # To use this variable just do something like this: - # set(PostgreSQL_ADDITIONAL_VERSIONS "9.2" "8.4.4") -@@ -102,7 +102,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher - - - set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} -- "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") -+ "16" "15" "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") - - # Define additional search paths for root directories. - set( PostgreSQL_ROOT_DIRECTORIES --- -2.41.0 - diff --git a/cmake.spec b/cmake.spec index 2f709bf..d29fb00 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,10 +69,10 @@ %global major_version 3 %global minor_version 27 -%global patch_version 6 +%global patch_version 7 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 1 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -123,13 +123,6 @@ Patch100: %{name}-findruby.patch Patch1: %{name}-rename.patch %endif -Patch10001: 0001-Linting-Fix-empty-evaluated-genex.patch -Patch10002: 0002-Android-Require-Clang-18-for-std-c-23.patch -Patch10003: 0003-Tests-Clarify-RunCMake.CTestTimeout-case-name.patch -Patch10004: 0004-ctest-Restore-support-for-timeout-values-higher-than.patch -Patch10005: 0005-Help-Document-CMP0124-behavior-on-already-set-variab.patch -Patch10006: 0006-FindPostgreSQL-Add-support-for-version-16.patch - BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc-c++ @@ -556,6 +549,10 @@ popd %changelog +* Sat Oct 07 2023 Björn Esser - 3.27.7-1 +- cmake-3.27.7 + Fixes rhbz#2242491 + * Tue Oct 03 2023 Björn Esser - 3.27.6-2 - Include new upstream patches diff --git a/sources b/sources index ee8c9ce..33c9587 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.6.tar.gz) = 268b5bd84800c37ce0e311cadf13c275a538d612844cc8687107549fe6341a6c3115560e3b9162836843016213d225f62db130bc251bf8aff50c69b9bd58e638 +SHA512 (cmake-3.27.7.tar.gz) = 2e9b83dee8f8c012be4219ab74ebaa8b8438ea55d5204237a1c9feba94c732afe7baceddb9c681672903112b1e40f7b1a86b284cfceed15f46ce8f90143dbb86 From 317a33461026e620030deba6a48fbcf7fd2e9715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 12 Oct 2023 10:49:02 +0200 Subject: [PATCH 184/238] cmake-3.28.0-rc1 Fixes rhbz#2243343 --- cmake.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index d29fb00..5ea3f47 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,14 +68,14 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 27 -%global patch_version 7 +%global minor_version 28 +%global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 # Set to RC version if building RC, else comment out. -#global rcsuf rc1 +%global rcsuf rc1 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -549,6 +549,10 @@ popd %changelog +* Thu Oct 12 2023 Björn Esser - 3.28.0~rc1-1 +- cmake-3.28.0-rc1 + Fixes rhbz#2243343 + * Sat Oct 07 2023 Björn Esser - 3.27.7-1 - cmake-3.27.7 Fixes rhbz#2242491 diff --git a/sources b/sources index 33c9587..f4059b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.27.7.tar.gz) = 2e9b83dee8f8c012be4219ab74ebaa8b8438ea55d5204237a1c9feba94c732afe7baceddb9c681672903112b1e40f7b1a86b284cfceed15f46ce8f90143dbb86 +SHA512 (cmake-3.28.0-rc1.tar.gz) = 693aa21b3c3ce3f090620d4819ce271ef7890ff4ce3462a6200ee759a5a7eabfd882765c4a5df6dad544d8f9bc4f640a00b33eaff232c7eaf789d7a755dd8448 From 40e5ea4b51a3d058bf0d3db74602cb0f0ba05b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 19 Oct 2023 12:40:37 +0200 Subject: [PATCH 185/238] cmake-3.28.0-rc2 Fixes rhbz#2243343 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 5ea3f47..8cf1dfb 100644 --- a/cmake.spec +++ b/cmake.spec @@ -75,7 +75,7 @@ %global baserelease 1 # Set to RC version if building RC, else comment out. -%global rcsuf rc1 +%global rcsuf rc2 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -549,6 +549,10 @@ popd %changelog +* Thu Oct 19 2023 Björn Esser - 3.28.0~rc2-1 +- cmake-3.28.0-rc2 + Fixes rhbz#2243343 + * Thu Oct 12 2023 Björn Esser - 3.28.0~rc1-1 - cmake-3.28.0-rc1 Fixes rhbz#2243343 diff --git a/sources b/sources index f4059b9..f238d74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.28.0-rc1.tar.gz) = 693aa21b3c3ce3f090620d4819ce271ef7890ff4ce3462a6200ee759a5a7eabfd882765c4a5df6dad544d8f9bc4f640a00b33eaff232c7eaf789d7a755dd8448 +SHA512 (cmake-3.28.0-rc2.tar.gz) = d97472ff40425c8ddf07ce90f139a8b39dd6ac5473233a4c36f3681f164f004a44c274fc4be722e51aae8fb54895b1b3c792bb0cfff78d4f66ed1b28b071a82a From a2c98e0624071d2ddad2159815485ec3f89edcc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 24 Oct 2023 21:07:54 +0200 Subject: [PATCH 186/238] cmake-3.28.0-rc3 Fixes rhbz#2243343 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 8cf1dfb..61bea0a 100644 --- a/cmake.spec +++ b/cmake.spec @@ -75,7 +75,7 @@ %global baserelease 1 # Set to RC version if building RC, else comment out. -%global rcsuf rc2 +%global rcsuf rc3 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -549,6 +549,10 @@ popd %changelog +* Tue Oct 24 2023 Björn Esser - 3.28.0~rc3-1 +- cmake-3.28.0-rc3 + Fixes rhbz#2243343 + * Thu Oct 19 2023 Björn Esser - 3.28.0~rc2-1 - cmake-3.28.0-rc2 Fixes rhbz#2243343 diff --git a/sources b/sources index f238d74..2fb6256 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.28.0-rc2.tar.gz) = d97472ff40425c8ddf07ce90f139a8b39dd6ac5473233a4c36f3681f164f004a44c274fc4be722e51aae8fb54895b1b3c792bb0cfff78d4f66ed1b28b071a82a +SHA512 (cmake-3.28.0-rc3.tar.gz) = 3090eaa0c747ad4978a43066a29e6b2f3d2c98dffea0e9f0354a5d18aea6f695dfe0850fcc414e32a23de2cab297af34389bb8182926048bbe6b0dd28572e2bc From 2081d2ee8b21380acf6554163269d0af40613347 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 23 Nov 2023 08:47:26 +0100 Subject: [PATCH 187/238] Improve C compatibility of LoadCommand tests Related to: --- cmake-c99.patch | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ cmake.spec | 6 +++- 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 cmake-c99.patch diff --git a/cmake-c99.patch b/cmake-c99.patch new file mode 100644 index 0000000..ce07793 --- /dev/null +++ b/cmake-c99.patch @@ -0,0 +1,83 @@ +Improve C compatibility of LoadCommand tests + +The previous code used char ** and const char ** types as if they were +the same. But they are distinct types in C, so when passing these +pointers as function arguments, their types have to match. Future C +compilers will treat this as an error, similar to what C++ compilers +do today. + +Submitted upstream: + + + +diff --git a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c +index 7176ebe9d4bd3c4e..ba13727d2b83a051 100644 +--- a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c ++++ b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c +@@ -16,14 +16,14 @@ static int CCONV InitialPass(void* inf, void* mf, int argc, char* argv[]) + { + char* file; + char* str; +- char* srcs; ++ const char* srcs; + const char* cstr; + char buffer[1024]; + void* source_file; + char* args[2]; +- char* ccArgs[4]; +- char* ccDep[1]; +- char* ccOut[1]; ++ const char* ccArgs[4]; ++ const char* ccDep[1]; ++ const char* ccOut[1]; + cmLoadedCommandInfo* info = (cmLoadedCommandInfo*)inf; + + cmVTKWrapTclData* cdata = +@@ -148,7 +148,10 @@ static int CCONV InitialPass(void* inf, void* mf, int argc, char* argv[]) + if (info->CAPI->GetTotalArgumentSize(2, args) != 13) { + return 0; + } +- info->CAPI->ExecuteCommand(mf, "SET", 2, args); ++ ++ ccArgs[0] = "TEST_EXEC"; ++ ccArgs[1] = "TRUE"; ++ info->CAPI->ExecuteCommand(mf, "SET", 2, ccArgs); + + /* make sure we can find the source file */ + if (!info->CAPI->GetSource(mf, argv[1])) { +diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c +index 7176ebe9d4bd3c4e..e3b332c1aa9d9108 100644 +--- a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c ++++ b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c +@@ -16,14 +16,14 @@ static int CCONV InitialPass(void* inf, void* mf, int argc, char* argv[]) + { + char* file; + char* str; +- char* srcs; +- const char* cstr; ++ const char* srcs; ++ char* cstr; + char buffer[1024]; + void* source_file; + char* args[2]; +- char* ccArgs[4]; +- char* ccDep[1]; +- char* ccOut[1]; ++ const char* ccArgs[4]; ++ const char* ccDep[1]; ++ const char* ccOut[1]; + cmLoadedCommandInfo* info = (cmLoadedCommandInfo*)inf; + + cmVTKWrapTclData* cdata = +@@ -148,7 +148,10 @@ static int CCONV InitialPass(void* inf, void* mf, int argc, char* argv[]) + if (info->CAPI->GetTotalArgumentSize(2, args) != 13) { + return 0; + } +- info->CAPI->ExecuteCommand(mf, "SET", 2, args); ++ ++ ccArgs[0] = "TEST_EXEC"; ++ ccArgs[1] = "TRUE"; ++ info->CAPI->ExecuteCommand(mf, "SET", 2, ccArgs); + + /* make sure we can find the source file */ + if (!info->CAPI->GetSource(mf, argv[1])) { diff --git a/cmake.spec b/cmake.spec index 61bea0a..dc9618c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. %global rcsuf rc3 @@ -117,6 +117,7 @@ Source5: %{name}.req # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch +Patch101: cmake-c99.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -549,6 +550,9 @@ popd %changelog +* Thu Nov 23 2023 Florian Weimer - 3.28.0~rc3-2 +- Improve C compatibility of LoadCommand tests + * Tue Oct 24 2023 Björn Esser - 3.28.0~rc3-1 - cmake-3.28.0-rc3 Fixes rhbz#2243343 From 83307619510d9315c3e0d827bfeb9cc28c56170a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 15:44:18 +0000 Subject: [PATCH 188/238] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index dc9618c..39d3510 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Set to RC version if building RC, else comment out. %global rcsuf rc3 @@ -550,6 +550,9 @@ popd %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.28.0~rc3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Nov 23 2023 Florian Weimer - 3.28.0~rc3-2 - Improve C compatibility of LoadCommand tests From ceb582021ba961ebe78200d74ffd1e31e00d4edb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 07:33:16 +0000 Subject: [PATCH 189/238] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 39d3510..54481c5 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Set to RC version if building RC, else comment out. %global rcsuf rc3 @@ -550,6 +550,9 @@ popd %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 3.28.0~rc3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.28.0~rc3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 815f5fcb16be9d12bb4e4438fb511d9187c42c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Thu, 1 Feb 2024 16:36:37 +0100 Subject: [PATCH 190/238] cmake-3.28.2 --- cmake-c99.patch | 83 ------------------------------------------------- cmake.spec | 10 +++--- sources | 2 +- 3 files changed, 7 insertions(+), 88 deletions(-) delete mode 100644 cmake-c99.patch diff --git a/cmake-c99.patch b/cmake-c99.patch deleted file mode 100644 index ce07793..0000000 --- a/cmake-c99.patch +++ /dev/null @@ -1,83 +0,0 @@ -Improve C compatibility of LoadCommand tests - -The previous code used char ** and const char ** types as if they were -the same. But they are distinct types in C, so when passing these -pointers as function arguments, their types have to match. Future C -compilers will treat this as an error, similar to what C++ compilers -do today. - -Submitted upstream: - - - -diff --git a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c -index 7176ebe9d4bd3c4e..ba13727d2b83a051 100644 ---- a/Tests/LoadCommand/CMakeCommands/cmTestCommand.c -+++ b/Tests/LoadCommand/CMakeCommands/cmTestCommand.c -@@ -16,14 +16,14 @@ static int CCONV InitialPass(void* inf, void* mf, int argc, char* argv[]) - { - char* file; - char* str; -- char* srcs; -+ const char* srcs; - const char* cstr; - char buffer[1024]; - void* source_file; - char* args[2]; -- char* ccArgs[4]; -- char* ccDep[1]; -- char* ccOut[1]; -+ const char* ccArgs[4]; -+ const char* ccDep[1]; -+ const char* ccOut[1]; - cmLoadedCommandInfo* info = (cmLoadedCommandInfo*)inf; - - cmVTKWrapTclData* cdata = -@@ -148,7 +148,10 @@ static int CCONV InitialPass(void* inf, void* mf, int argc, char* argv[]) - if (info->CAPI->GetTotalArgumentSize(2, args) != 13) { - return 0; - } -- info->CAPI->ExecuteCommand(mf, "SET", 2, args); -+ -+ ccArgs[0] = "TEST_EXEC"; -+ ccArgs[1] = "TRUE"; -+ info->CAPI->ExecuteCommand(mf, "SET", 2, ccArgs); - - /* make sure we can find the source file */ - if (!info->CAPI->GetSource(mf, argv[1])) { -diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c -index 7176ebe9d4bd3c4e..e3b332c1aa9d9108 100644 ---- a/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c -+++ b/Tests/LoadCommandOneConfig/CMakeCommands/cmTestCommand.c -@@ -16,14 +16,14 @@ static int CCONV InitialPass(void* inf, void* mf, int argc, char* argv[]) - { - char* file; - char* str; -- char* srcs; -- const char* cstr; -+ const char* srcs; -+ char* cstr; - char buffer[1024]; - void* source_file; - char* args[2]; -- char* ccArgs[4]; -- char* ccDep[1]; -- char* ccOut[1]; -+ const char* ccArgs[4]; -+ const char* ccDep[1]; -+ const char* ccOut[1]; - cmLoadedCommandInfo* info = (cmLoadedCommandInfo*)inf; - - cmVTKWrapTclData* cdata = -@@ -148,7 +148,10 @@ static int CCONV InitialPass(void* inf, void* mf, int argc, char* argv[]) - if (info->CAPI->GetTotalArgumentSize(2, args) != 13) { - return 0; - } -- info->CAPI->ExecuteCommand(mf, "SET", 2, args); -+ -+ ccArgs[0] = "TEST_EXEC"; -+ ccArgs[1] = "TRUE"; -+ info->CAPI->ExecuteCommand(mf, "SET", 2, ccArgs); - - /* make sure we can find the source file */ - if (!info->CAPI->GetSource(mf, argv[1])) { diff --git a/cmake.spec b/cmake.spec index 54481c5..6783d8d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,13 +69,13 @@ %global major_version 3 %global minor_version 28 -%global patch_version 0 +%global patch_version 2 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 4 +%global baserelease 1 # Set to RC version if building RC, else comment out. -%global rcsuf rc3 +#%%global rcsuf rc3 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -117,7 +117,6 @@ Source5: %{name}.req # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch -Patch101: cmake-c99.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -550,6 +549,9 @@ popd %changelog +* Thu Feb 01 2024 Frantisek Zatloukal - 3.28.2-1 +- cmake-3.28.2 (fixes RHBZ#2261037 and RHBZ#2243343) + * Wed Jan 24 2024 Fedora Release Engineering - 3.28.0~rc3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 2fb6256..7b3e639 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.28.0-rc3.tar.gz) = 3090eaa0c747ad4978a43066a29e6b2f3d2c98dffea0e9f0354a5d18aea6f695dfe0850fcc414e32a23de2cab297af34389bb8182926048bbe6b0dd28572e2bc +SHA512 (cmake-3.28.2.tar.gz) = 225f6d3eb56d41c449a32f7c3e0f8f3ffafbbf45474e29ad86e965a87f8d95e55e87affc62ef0a7b25c9fb070c6fca08e9838539e5f7011dc3ee83787025151b From 8d718fa234892997e5aeb95564b9cbc38a8242ee Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 20 Feb 2024 13:41:54 +0000 Subject: [PATCH 191/238] Add %ctest timeout on riscv64 Since our riscv64 builders are slow at the moment some tests fail with timeouts, eg: https://src.fedoraproject.org/rpms/kokkos/pull-request/11 Adding the --timeout flag on riscv64 only increases the timeout and makes the tests pass. Adding this centrally makes it easier to remove it later once faster hardware becomes widely available. Signed-off-by: Richard W.M. Jones --- macros.cmake.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/macros.cmake.in b/macros.cmake.in index 5c9307a..675ca90 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -44,7 +44,13 @@ DESTDIR="%{buildroot}" %__cmake --install "%{__cmake_builddir}" %ctest(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \ - %__ctest --test-dir "%{__cmake_builddir}" --output-on-failure --force-new-ctest-process %{?_smp_mflags} %{**} + %__ctest --test-dir "%{__cmake_builddir}" \\\ + --output-on-failure \\\ + --force-new-ctest-process \\\ +%ifarch riscv64 \ + --timeout 6000 \\\ +%endif \ + %{?_smp_mflags} %{**} %cmake@@CMAKE_MAJOR_VERSION@@ %cmake From 809dad0080ad522c2c679156d87e3f83400659ac Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 27 Feb 2024 17:35:10 -0700 Subject: [PATCH 192/238] Update to 3.28.3 (should fix bz#2261013) --- cmake.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 6783d8d..488707e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global major_version 3 %global minor_version 28 -%global patch_version 2 +%global patch_version 3 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -549,6 +549,9 @@ popd %changelog +* Tue Feb 27 2024 Orion Poplawski - 3.28.3-1 +- Update to 3.28.3 (should fix bz#2261013) + * Thu Feb 01 2024 Frantisek Zatloukal - 3.28.2-1 - cmake-3.28.2 (fixes RHBZ#2261037 and RHBZ#2243343) diff --git a/sources b/sources index 7b3e639..f7e5661 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.28.2.tar.gz) = 225f6d3eb56d41c449a32f7c3e0f8f3ffafbbf45474e29ad86e965a87f8d95e55e87affc62ef0a7b25c9fb070c6fca08e9838539e5f7011dc3ee83787025151b +SHA512 (cmake-3.28.3.tar.gz) = 66e923925b764e1fe3d150c69dab3e0abd9e0c90d8e30cab63c3a1f70c3e37df0a5e3ff12b378eeae3bdc6608495f41399e6f81602e26b513b19fa19ff6c48fc From 335568208d564dce802fc05f12b1a43f448560a7 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Wed, 15 Nov 2023 13:25:31 +0200 Subject: [PATCH 193/238] Disable another timeout test on riscv64 We are timing out on Qt6Autogen.MocIncludeSymlink. Signed-off-by: David Abdurachmanov --- cmake.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 488707e..f673de0 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 3 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -471,7 +471,7 @@ NO_TEST="$NO_TEST|curl" %endif %ifarch riscv64 # These three tests timeout on riscv64, skip them. -NO_TEST="$NO_TEST|Qt5Autogen.ManySources|Qt5Autogen.MocInclude|Qt5Autogen.MocIncludeSymlink" +NO_TEST="$NO_TEST|Qt5Autogen.ManySources|Qt5Autogen.MocInclude|Qt5Autogen.MocIncludeSymlink|Qt6Autogen.MocIncludeSymlink" %endif bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure ## do this only periodically, not for every build -- besser82 20221102 @@ -549,6 +549,9 @@ popd %changelog +* Wed Mar 06 2024 David Abdurachmanov - 3.28.3-2 +- Disable another timeout test on riscv64 + * Tue Feb 27 2024 Orion Poplawski - 3.28.3-1 - Update to 3.28.3 (should fix bz#2261013) From b6af92ee63eeec0223184f5f9ec054fc02d5263f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 22 Apr 2024 20:39:07 -0600 Subject: [PATCH 194/238] Rebuild for rhash 1.4.4 soname bump --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index f673de0..a25db31 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 3 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -549,6 +549,9 @@ popd %changelog +* Tue Apr 23 2024 Orion Poplawski - 3.28.3-3 +- Rebuild for rhash 1.4.4 soname bump + * Wed Mar 06 2024 David Abdurachmanov - 3.28.3-2 - Disable another timeout test on riscv64 From fd9f6505a22a00555ede95df025b412b1f20bec0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 22 Apr 2024 20:49:02 -0600 Subject: [PATCH 195/238] Build without gui to avoid circular dep on self --- cmake.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index a25db31..011d98b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -17,7 +17,7 @@ %bcond_without git_test # Set to bcond_with or use --without gui to disable qt gui build -%bcond_without gui +%bcond_with gui # Use ncurses for colorful output %bcond_without ncurses @@ -551,6 +551,7 @@ popd %changelog * Tue Apr 23 2024 Orion Poplawski - 3.28.3-3 - Rebuild for rhash 1.4.4 soname bump +- Build without gui to avoid circular dep on self * Wed Mar 06 2024 David Abdurachmanov - 3.28.3-2 - Disable another timeout test on riscv64 From 103d8d98cf1080783646790128cf590a3200ea15 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 22 Apr 2024 21:51:27 -0600 Subject: [PATCH 196/238] Build with gui again --- cmake.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 011d98b..c812fee 100644 --- a/cmake.spec +++ b/cmake.spec @@ -17,7 +17,7 @@ %bcond_without git_test # Set to bcond_with or use --without gui to disable qt gui build -%bcond_with gui +%bcond_without gui # Use ncurses for colorful output %bcond_without ncurses @@ -72,7 +72,7 @@ %global patch_version 3 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -549,6 +549,9 @@ popd %changelog +* Tue Apr 23 2024 Orion Poplawski - 3.28.3-4 +- Build with gui again + * Tue Apr 23 2024 Orion Poplawski - 3.28.3-3 - Rebuild for rhash 1.4.4 soname bump - Build without gui to avoid circular dep on self From 7fdd987674088c3d98082a8d783efaa4fb721220 Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 15 May 2024 15:02:22 +0200 Subject: [PATCH 197/238] Add python3-cmake sub package The sub package provides metadata only for Python packages depending on CMake facilitating automatic dependency resolution. --- cmake.spec | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index c812fee..abf0ccc 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 3 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 4 +%global baserelease 5 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -288,6 +288,17 @@ BuildArch: noarch This package contains common RPM macros for %{name}. +%package -n python3-cmake +Summary: Python metadata for packages depending on %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +BuildArch: noarch + +%description -n python3-cmake +Package provides metadata for Python packages depending on cmake. +This is to make automatic dependency resolution work. The package is NOT +using anything from the PyPI package called cmake. + + %prep %autosetup -n %{orig_name}-%{tar_version} -p 1 @@ -339,6 +350,21 @@ $SRCDIR/bootstrap --prefix=%{_prefix} \ popd %make_build -C %{_vpath_builddir} +# Provide Python metadata +%global cmake_distinfo cmake-%{major_version}.%{minor_version}.%{patch_version}%{?rcsuf}.dist-info +mkdir %{cmake_distinfo} +cat > %{cmake_distinfo}/METADATA << EOF +Metadata-Version: 2.1 +Name: cmake +Version: %{major_version}.%{minor_version}.%{patch_version}%{?rcsuf} +Summary: %{summary} +Description-Content-Type: text/plain + +Metadata only package for automatic dependency resolution in the RPM +ecosystem. This package is separate from the PyPI package called cmake. +EOF +echo rpm > %{cmake_distinfo}/INSTALLER + %install mkdir -p %{buildroot}%{_pkgdocdir} @@ -453,6 +479,10 @@ find %{buildroot}%{_libdir}/%{orig_name} -type f | \ find %{buildroot}%{_bindir} -type f -or -type l -or -xtype l | \ sed -e '/.*-gui$/d' -e '/^$/d' -e 's!^%{buildroot}!"!g' -e 's!$!"!g' >> lib_files.mf +# Install Python metadata +mkdir -p %{buildroot}%{python3_sitelib} +cp -a %{cmake_distinfo} %{buildroot}%{python3_sitelib} + %if %{with test} %check @@ -548,7 +578,15 @@ popd %endif +%files -n python3-cmake +%{python3_sitelib}/%{cmake_distinfo} + + %changelog +* Wed May 15 2024 Sandro - 3.28.3-5 +- Add python3-cmake sub package providing metadata for Python packages + depending on CMake to facilitate automatic dependency resolution. + * Tue Apr 23 2024 Orion Poplawski - 3.28.3-4 - Build with gui again From 7cf9b37a2e7809c3b9900e709d884bc5ad502afc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 14:08:19 +0200 Subject: [PATCH 198/238] Rebuilt for Python 3.13 --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index abf0ccc..a6d955b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 3 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 5 +%global baserelease 6 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -583,6 +583,9 @@ popd %changelog +* Fri Jun 07 2024 Python Maint - 3.28.3-6 +- Rebuilt for Python 3.13 + * Wed May 15 2024 Sandro - 3.28.3-5 - Add python3-cmake sub package providing metadata for Python packages depending on CMake to facilitate automatic dependency resolution. From 8c9971820eb9c6be64c8bb3d6182bb26242eba7a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 19:33:43 +0000 Subject: [PATCH 199/238] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index a6d955b..2c06fad 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 3 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 6 +%global baserelease 7 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -583,6 +583,9 @@ popd %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.28.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 3.28.3-6 - Rebuilt for Python 3.13 From a0dcf332ee3ffcf25ce76755895a69e422ed0c0f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 19 Sep 2024 23:19:19 -0400 Subject: [PATCH 200/238] Assure that network-dependent tests are not run mock builds do not have network access, and any automatic detection in the test environment is not consistently reliable. --- cmake.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 2c06fad..1277e2d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -346,7 +346,8 @@ $SRCDIR/bootstrap --prefix=%{_prefix} \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-O2 -g -DNDEBUG" \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ - -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF + -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \ + -DCMake_TEST_NO_NETWORK:BOOL=ON popd %make_build -C %{_vpath_builddir} From 7f9289bf4cabbdf7750abbd96a553b58e461c397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 17 Oct 2024 21:31:33 +0200 Subject: [PATCH 201/238] FindPython: Add Python 3.14 to the list of hardcoded Python versions --- cmake-python3.14.patch | 53 ++++++++++++++++++++++++++++++++++++++++++ cmake.spec | 8 ++++++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 cmake-python3.14.patch diff --git a/cmake-python3.14.patch b/cmake-python3.14.patch new file mode 100644 index 0000000..e16248c --- /dev/null +++ b/cmake-python3.14.patch @@ -0,0 +1,53 @@ +From be958c8f3529248c0c234596dab230a034424662 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Thu, 17 Oct 2024 21:27:32 +0200 +Subject: [PATCH] FindPython: Add support for Python 3.14 + +--- + Modules/FindPython/Support.cmake | 2 +- + Modules/FindPythonInterp.cmake | 2 +- + Modules/FindPythonLibs.cmake | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake +index faca5ae98a6..e0bdbc54060 100644 +--- a/Modules/FindPython/Support.cmake ++++ b/Modules/FindPython/Support.cmake +@@ -30,7 +30,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR) + message (FATAL_ERROR "FindPython: INTERNAL ERROR") + endif() + if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3") +- set(_${_PYTHON_PREFIX}_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++ set(_${_PYTHON_PREFIX}_VERSIONS 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2") + set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) + else() +diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake +index 443c6ebf612..e5bcb5f5d1a 100644 +--- a/Modules/FindPythonInterp.cmake ++++ b/Modules/FindPythonInterp.cmake +@@ -67,7 +67,7 @@ unset(_Python_NAMES) + + set(_PYTHON1_VERSIONS 1.6 1.5) + set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) +-set(_PYTHON3_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + + if(PythonInterp_FIND_VERSION) + if(PythonInterp_FIND_VERSION_COUNT GREATER 1) +diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake +index 112adaeba07..467e8c2759e 100644 +--- a/Modules/FindPythonLibs.cmake ++++ b/Modules/FindPythonLibs.cmake +@@ -96,7 +96,7 @@ set(CMAKE_FIND_FRAMEWORK LAST) + + set(_PYTHON1_VERSIONS 1.6 1.5) + set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) +-set(_PYTHON3_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) ++set(_PYTHON3_VERSIONS 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) + + if(PythonLibs_FIND_VERSION) + if(PythonLibs_FIND_VERSION_COUNT GREATER 1) +-- +GitLab + diff --git a/cmake.spec b/cmake.spec index 1277e2d..912e89b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 3 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 7 +%global baserelease 8 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -117,6 +117,9 @@ Source5: %{name}.req # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch +# +# FindPython: Add Python 3.14 to the list of hardcoded Python versions +Patch101: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9915.patch#/%{name}-python3.14.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -584,6 +587,9 @@ popd %changelog +* Thu Oct 17 2024 Miro Hrončok - 3.28.3-8 +- FindPython: Add Python 3.14 to the list of hardcoded Python versions + * Wed Jul 17 2024 Fedora Release Engineering - 3.28.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 49317eb0f29ccb4347cfd2d36ffc142e379c8597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 3 Nov 2024 21:06:14 +0100 Subject: [PATCH 202/238] cmake-3.30.5 Fixes rhbz#2262837 --- cmake.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index 912e89b..a16a709 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,11 +68,11 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 28 -%global patch_version 3 +%global minor_version 30 +%global patch_version 5 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 8 +%global baserelease 1 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -587,6 +587,10 @@ popd %changelog +* Sun Nov 03 2024 Björn Esser - 3.30.5-1 +- cmake-3.30.5 + Fixes rhbz#2262837 + * Thu Oct 17 2024 Miro Hrončok - 3.28.3-8 - FindPython: Add Python 3.14 to the list of hardcoded Python versions diff --git a/sources b/sources index f7e5661..c7e34c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.28.3.tar.gz) = 66e923925b764e1fe3d150c69dab3e0abd9e0c90d8e30cab63c3a1f70c3e37df0a5e3ff12b378eeae3bdc6608495f41399e6f81602e26b513b19fa19ff6c48fc +SHA512 (cmake-3.30.5.tar.gz) = 968ad4769e869378049b1d82ace98db25a6cb234b6362a51737f0d2978b8914ad42967ba112741850b23631e73b8a8876cd4f99dd0285b9da1c2bb5ea4c4ee4e From a02c626742dda42ec29fc579eefcdaf87f744902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 4 Nov 2024 11:18:25 +0100 Subject: [PATCH 203/238] cmake-findruby.patch: Update for alignment --- cmake-findruby.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake-findruby.patch b/cmake-findruby.patch index 72a8b25..9dfcc02 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.30.5/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.30.5.orig/Modules/FindRuby.cmake ++++ cmake-3.30.5/Modules/FindRuby.cmake +@@ -312,14 +312,9 @@ if(Ruby_EXECUTABLE AND NOT Ruby_VERSION_ _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR) From ae4cdafd9559d41c28db24eb9aacecd48591d20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 8 Nov 2024 19:43:47 +0100 Subject: [PATCH 204/238] cmake-3.31.0 Fixes rhbz#2324190 --- cmake-findruby.patch | 6 ++--- cmake-python3.14.patch | 53 ------------------------------------------ cmake.spec | 11 +++++---- sources | 2 +- 4 files changed, 10 insertions(+), 62 deletions(-) delete mode 100644 cmake-python3.14.patch diff --git a/cmake-findruby.patch b/cmake-findruby.patch index 9dfcc02..14cb332 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,7 +1,7 @@ -Index: cmake-3.30.5/Modules/FindRuby.cmake +Index: cmake-3.31.0/Modules/FindRuby.cmake =================================================================== ---- cmake-3.30.5.orig/Modules/FindRuby.cmake -+++ cmake-3.30.5/Modules/FindRuby.cmake +--- cmake-3.31.0.orig/Modules/FindRuby.cmake ++++ cmake-3.31.0/Modules/FindRuby.cmake @@ -312,14 +312,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-python3.14.patch b/cmake-python3.14.patch deleted file mode 100644 index e16248c..0000000 --- a/cmake-python3.14.patch +++ /dev/null @@ -1,53 +0,0 @@ -From be958c8f3529248c0c234596dab230a034424662 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Thu, 17 Oct 2024 21:27:32 +0200 -Subject: [PATCH] FindPython: Add support for Python 3.14 - ---- - Modules/FindPython/Support.cmake | 2 +- - Modules/FindPythonInterp.cmake | 2 +- - Modules/FindPythonLibs.cmake | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake -index faca5ae98a6..e0bdbc54060 100644 ---- a/Modules/FindPython/Support.cmake -+++ b/Modules/FindPython/Support.cmake -@@ -30,7 +30,7 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR) - message (FATAL_ERROR "FindPython: INTERNAL ERROR") - endif() - if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3") -- set(_${_PYTHON_PREFIX}_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+ set(_${_PYTHON_PREFIX}_VERSIONS 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - elseif (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "2") - set(_${_PYTHON_PREFIX}_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) - else() -diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake -index 443c6ebf612..e5bcb5f5d1a 100644 ---- a/Modules/FindPythonInterp.cmake -+++ b/Modules/FindPythonInterp.cmake -@@ -67,7 +67,7 @@ unset(_Python_NAMES) - - set(_PYTHON1_VERSIONS 1.6 1.5) - set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) --set(_PYTHON3_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(PythonInterp_FIND_VERSION) - if(PythonInterp_FIND_VERSION_COUNT GREATER 1) -diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake -index 112adaeba07..467e8c2759e 100644 ---- a/Modules/FindPythonLibs.cmake -+++ b/Modules/FindPythonLibs.cmake -@@ -96,7 +96,7 @@ set(CMAKE_FIND_FRAMEWORK LAST) - - set(_PYTHON1_VERSIONS 1.6 1.5) - set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) --set(_PYTHON3_VERSIONS 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - - if(PythonLibs_FIND_VERSION) - if(PythonLibs_FIND_VERSION_COUNT GREATER 1) --- -GitLab - diff --git a/cmake.spec b/cmake.spec index a16a709..665eaf1 100644 --- a/cmake.spec +++ b/cmake.spec @@ -68,8 +68,8 @@ %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} %global major_version 3 -%global minor_version 30 -%global patch_version 5 +%global minor_version 31 +%global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -117,9 +117,6 @@ Source5: %{name}.req # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch -# -# FindPython: Add Python 3.14 to the list of hardcoded Python versions -Patch101: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9915.patch#/%{name}-python3.14.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -587,6 +584,10 @@ popd %changelog +* Fri Nov 08 2024 Björn Esser - 3.31.0-1 +- cmake-3.31.0 + Fixes rhbz#2324190 + * Sun Nov 03 2024 Björn Esser - 3.30.5-1 - cmake-3.30.5 Fixes rhbz#2262837 diff --git a/sources b/sources index c7e34c0..a847ac0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.30.5.tar.gz) = 968ad4769e869378049b1d82ace98db25a6cb234b6362a51737f0d2978b8914ad42967ba112741850b23631e73b8a8876cd4f99dd0285b9da1c2bb5ea4c4ee4e +SHA512 (cmake-3.31.0.tar.gz) = feea7e7e86cfbc228d83c96b84502146516d003a753a2daeeaabb4d2dedefae881c44de7e1e9b424680b0047568c12632472a0030c5ce8413033f94f9b361700 From 6eb0082a1d74f0115ef9b22828f926b5ff4b21b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 1 Dec 2024 12:15:33 +0100 Subject: [PATCH 205/238] macros: Fix handling of double-dash without argument for ctest. --- macros.cmake.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/macros.cmake.in b/macros.cmake.in index 675ca90..5c7721f 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -50,7 +50,8 @@ %ifarch riscv64 \ --timeout 6000 \\\ %endif \ - %{?_smp_mflags} %{**} + %{?_smp_mflags} \\\ + %{lua:args=string.gsub(rpm.expand('%{**}'),"%-%-%s","");print(args);} %cmake@@CMAKE_MAJOR_VERSION@@ %cmake From bc731776781b0a57ec05825e78369ef41a898810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 1 Dec 2024 12:21:32 +0100 Subject: [PATCH 206/238] cmake-3.31.1 Fixes rhbz#2324190 --- cmake.spec | 7 ++++++- sources | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 665eaf1..e5de11d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global major_version 3 %global minor_version 31 -%global patch_version 0 +%global patch_version 1 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -584,6 +584,11 @@ popd %changelog +* Sun Dec 01 2024 Björn Esser - 3.31.1-1 +- cmake-3.31.1 + Fixes rhbz#2324190 +- macros: Fix handling of double-dash without argument for ctest + * Fri Nov 08 2024 Björn Esser - 3.31.0-1 - cmake-3.31.0 Fixes rhbz#2324190 diff --git a/sources b/sources index a847ac0..47a512d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.31.0.tar.gz) = feea7e7e86cfbc228d83c96b84502146516d003a753a2daeeaabb4d2dedefae881c44de7e1e9b424680b0047568c12632472a0030c5ce8413033f94f9b361700 +SHA512 (cmake-3.31.1.tar.gz) = 9c4664792b32b1fa76aa66c5211e8a0a1fed380eb48ff605adb516d056ae3ab94859cf4103d86b83e220baba3ec5b763b454b6866d6bd606fc558fa3da75b146 From 9e821b969794928715b05012526f6983151a83f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 1 Dec 2024 15:12:57 +0100 Subject: [PATCH 207/238] Fix macro-in-%changelog --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index e5de11d..2cd5d3b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1015,7 +1015,7 @@ popd - Add patch to support FlexiBLAS * Tue Sep 29 2020 Christoph Junghans - 3.18.2-2 -- Make %ctest non-verbose by default +- Make %%ctest non-verbose by default * Thu Aug 20 2020 Björn Esser - 3.18.2-1 - Update to 3.18.2 From 91e51433591bdca91abf0c9b63e1830836921f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 1 Dec 2024 15:16:16 +0100 Subject: [PATCH 208/238] Skip some test that fail for Fedora 41 --- cmake.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake.spec b/cmake.spec index 2cd5d3b..20b219c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -504,6 +504,10 @@ NO_TEST="$NO_TEST|curl" # These three tests timeout on riscv64, skip them. NO_TEST="$NO_TEST|Qt5Autogen.ManySources|Qt5Autogen.MocInclude|Qt5Autogen.MocIncludeSymlink|Qt6Autogen.MocIncludeSymlink" %endif +%if 0%{?fedora} == 41 +# Test failing on Fedora 41, only. +NO_TEST="$NO_TEST|RunCMake.Make|RunCMake.BuildDepends|Qt6Autogen.RerunMocBasic|Qt6Autogen.RerunRccDepends" +%endif bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure ## do this only periodically, not for every build -- besser82 20221102 # Keep an eye on failing tests From dfb5aebef38c1f1542a89841b7c96cb2970754e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 2 Dec 2024 17:15:20 +0100 Subject: [PATCH 209/238] macros: Simplify lua code for ctest argument processing --- macros.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.cmake.in b/macros.cmake.in index 5c7721f..9910bf5 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -51,7 +51,7 @@ --timeout 6000 \\\ %endif \ %{?_smp_mflags} \\\ - %{lua:args=string.gsub(rpm.expand('%{**}'),"%-%-%s","");print(args);} + %{lua:print((string.gsub(rpm.expand('%{*}'),"%-%-%s","")))} %cmake@@CMAKE_MAJOR_VERSION@@ %cmake From 580359116c046f6e500e9adce7004e5cb68d6369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 2 Dec 2024 17:21:05 +0100 Subject: [PATCH 210/238] macros: Fix missing asterisk in ctest macro --- macros.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.cmake.in b/macros.cmake.in index 9910bf5..fa7e967 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -51,7 +51,7 @@ --timeout 6000 \\\ %endif \ %{?_smp_mflags} \\\ - %{lua:print((string.gsub(rpm.expand('%{*}'),"%-%-%s","")))} + %{lua:print((string.gsub(rpm.expand('%{**}'),"%-%-%s","")))} %cmake@@CMAKE_MAJOR_VERSION@@ %cmake From f7c27888e03083eb91781b841450f9cd2ad9c786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 5 Dec 2024 23:09:43 +0100 Subject: [PATCH 211/238] cmake-3.31.2 Fixes rhbz#2330603 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 20b219c..1b76fa6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global major_version 3 %global minor_version 31 -%global patch_version 1 +%global patch_version 2 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -588,6 +588,10 @@ popd %changelog +* Thu Dec 05 2024 Björn Esser - 3.31.2-1 +- cmake-3.31.2 + Fixes rhbz#2330603 + * Sun Dec 01 2024 Björn Esser - 3.31.1-1 - cmake-3.31.1 Fixes rhbz#2324190 diff --git a/sources b/sources index 47a512d..59f656d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.31.1.tar.gz) = 9c4664792b32b1fa76aa66c5211e8a0a1fed380eb48ff605adb516d056ae3ab94859cf4103d86b83e220baba3ec5b763b454b6866d6bd606fc558fa3da75b146 +SHA512 (cmake-3.31.2.tar.gz) = 72ba95bfb514ed7aeb3fcb7ec086c95d00c38c50f06f07cc384f49589dc0c017e4cdb07a850db59c4d36f6f894b6924032236e3655ed751dc8b0b10e0ab21e23 From 7cc36b3cf19d015e24a24338a41b932a77b294f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 22 Dec 2024 22:25:21 +0100 Subject: [PATCH 212/238] cmake-3.31.3 Fixes rhbz#2333376 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 1b76fa6..0bfb9bc 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global major_version 3 %global minor_version 31 -%global patch_version 2 +%global patch_version 3 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -588,6 +588,10 @@ popd %changelog +* Sun Dec 22 2024 Björn Esser - 3.31.3-1 +- cmake-3.31.3 + Fixes rhbz#2333376 + * Thu Dec 05 2024 Björn Esser - 3.31.2-1 - cmake-3.31.2 Fixes rhbz#2330603 diff --git a/sources b/sources index 59f656d..3ab7751 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.31.2.tar.gz) = 72ba95bfb514ed7aeb3fcb7ec086c95d00c38c50f06f07cc384f49589dc0c017e4cdb07a850db59c4d36f6f894b6924032236e3655ed751dc8b0b10e0ab21e23 +SHA512 (cmake-3.31.3.tar.gz) = d7209c023ce7d45aa3fe4aee78271b89b3c4b1b71b183e978ba0b709255c8db0530d565e083e2dd881df3a18274d901930f70827614ee4df7bb6f4c7d50eae7e From 461007aa96c96c037aab1c0896f18b3143e262a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 12 Jan 2025 13:30:37 +0100 Subject: [PATCH 213/238] cmake-3.31.4 Fixes rhbz#2336980 --- cmake-findruby.patch | 8 ++++---- cmake.spec | 6 +++++- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cmake-findruby.patch b/cmake-findruby.patch index 14cb332..8a06752 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,8 +1,8 @@ -Index: cmake-3.31.0/Modules/FindRuby.cmake +Index: cmake-3.31.4/Modules/FindRuby.cmake =================================================================== ---- cmake-3.31.0.orig/Modules/FindRuby.cmake -+++ cmake-3.31.0/Modules/FindRuby.cmake -@@ -312,14 +312,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 0bfb9bc..c4878d7 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global major_version 3 %global minor_version 31 -%global patch_version 3 +%global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -588,6 +588,10 @@ popd %changelog +* Sun Jan 12 2025 Björn Esser - 3.31.4-1 +- cmake-3.31.4 + Fixes rhbz#2336980 + * Sun Dec 22 2024 Björn Esser - 3.31.3-1 - cmake-3.31.3 Fixes rhbz#2333376 diff --git a/sources b/sources index 3ab7751..7f2691c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.31.3.tar.gz) = d7209c023ce7d45aa3fe4aee78271b89b3c4b1b71b183e978ba0b709255c8db0530d565e083e2dd881df3a18274d901930f70827614ee4df7bb6f4c7d50eae7e +SHA512 (cmake-3.31.4.tar.gz) = 86fef54e3c60a2d050bad97968a76f9c2a663fbd0be433fe3ecbb3268e3ef8243dfcb52f0d7ba9d8b03341c142ee02b33d367dd56597e1af79f6efb553b9eb82 From 4318f10b1f9173e874c46dd96424d791e8627381 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:01:48 +0000 Subject: [PATCH 214/238] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index c4878d7..51c8c6d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -588,6 +588,9 @@ popd %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.31.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Jan 12 2025 Björn Esser - 3.31.4-1 - cmake-3.31.4 Fixes rhbz#2336980 From 50418679583e94612739982e4b7668ec5ec33f9e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 23 Jan 2025 08:13:25 -0700 Subject: [PATCH 215/238] Define CMAKE_INSTALL_FULL_SBINDIR/CMAKE_INSTALL_SBINDIR to help with sbin merge --- cmake.spec | 6 +++++- macros.cmake.in | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 51c8c6d..fa7fdb3 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -588,6 +588,10 @@ popd %changelog +* Thu Jan 23 2025 Orion Poplawski - 3.31.4-3 +- Define CMAKE_INSTALL_FULL_SBINDIR/CMAKE_INSTALL_SBINDIR to help with sbin + merge + * Thu Jan 16 2025 Fedora Release Engineering - 3.31.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/macros.cmake.in b/macros.cmake.in index fa7e967..a2cbd48 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -28,6 +28,8 @@ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\ -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ + -DCMAKE_INSTALL_FULL_SBINDIR:PATH=%{_sbindir} \\\ + -DCMAKE_INSTALL_SBINDIR:PATH=%(s=%{_sbindir}; echo ${s##*/}) \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ From 7029572a9d0c9662b52c7c57793a70866eddf2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 24 Jan 2025 10:11:22 +0100 Subject: [PATCH 216/238] cmake-3.31.5 Fixes rhbz#2341786 --- cmake.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index fa7fdb3..4e0858f 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,10 +69,10 @@ %global major_version 3 %global minor_version 31 -%global patch_version 4 +%global patch_version 5 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 1 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -588,6 +588,10 @@ popd %changelog +* Fri Jan 24 2025 Björn Esser - 3.31.5-1 +- cmake-3.31.5 + Fixes rhbz#2341786 + * Thu Jan 23 2025 Orion Poplawski - 3.31.4-3 - Define CMAKE_INSTALL_FULL_SBINDIR/CMAKE_INSTALL_SBINDIR to help with sbin merge diff --git a/sources b/sources index 7f2691c..9c5f85e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.31.4.tar.gz) = 86fef54e3c60a2d050bad97968a76f9c2a663fbd0be433fe3ecbb3268e3ef8243dfcb52f0d7ba9d8b03341c142ee02b33d367dd56597e1af79f6efb553b9eb82 +SHA512 (cmake-3.31.5.tar.gz) = 1981efafa8916371caf58b1fcbf9c9d73d365ec119279860ee2fa11f4ff72d87bb3a4570eb20a45fae95260bb8f565daf2f579a890b2dad588207b3fcc158e43 From c52839340c134e02aa890370fc17af530ebab9b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 24 Feb 2025 19:48:32 +0100 Subject: [PATCH 217/238] cmake-3.31.6 Fixes rhbz#2347346 --- cmake.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 4e0858f..487d4c4 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global major_version 3 %global minor_version 31 -%global patch_version 5 +%global patch_version 6 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 @@ -588,6 +588,10 @@ popd %changelog +* Mon Feb 24 2025 Björn Esser - 3.31.6-1 +- cmake-3.31.6 + Fixes rhbz#2347346 + * Fri Jan 24 2025 Björn Esser - 3.31.5-1 - cmake-3.31.5 Fixes rhbz#2341786 diff --git a/sources b/sources index 9c5f85e..df523b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.31.5.tar.gz) = 1981efafa8916371caf58b1fcbf9c9d73d365ec119279860ee2fa11f4ff72d87bb3a4570eb20a45fae95260bb8f565daf2f579a890b2dad588207b3fcc158e43 +SHA512 (cmake-3.31.6.tar.gz) = 839d06b6ebd0bf78cbe8f7ae3a7c00026e70d759a81ac51aa103f35ad985ac69be9e667aae7b5fe48c5e0c41baec791259279679dbdf2ddd8b63a48382a8a2a0 From f304eb1c7d99e77f23b2acc5c8eb1be76494c583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 26 Feb 2025 14:46:43 +0100 Subject: [PATCH 218/238] cmake-4.0.0-rc2 --- cmake-findruby.patch | 26 +++++++++++++++++--------- cmake.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/cmake-findruby.patch b/cmake-findruby.patch index 8a06752..5de08ee 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,22 +1,30 @@ -Index: cmake-3.31.4/Modules/FindRuby.cmake +Index: cmake-4.0.0-rc2/Modules/FindRuby.cmake =================================================================== ---- 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_ +--- cmake-4.0.0-rc2.orig/Modules/FindRuby.cmake ++++ cmake-4.0.0-rc2/Modules/FindRuby.cmake +@@ -285,14 +285,9 @@ if (Ruby_EXECUTABLE AND NOT Ruby_EXECUTA _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR) _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR) - # vendor_ruby available ? - execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'" -- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET) +- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET) - -- if(Ruby_HAS_VENDOR_RUBY) +- if (Ruby_HAS_VENDOR_RUBY) - _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) - _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) -- endif() -+ # vendor_ruby +- endif () ++# vendor_ruby + _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) + _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) # save the results in the cache so we don't have to run ruby the next time again - set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) + set(_Ruby_EXECUTABLE_LAST_QUERIED "${Ruby_EXECUTABLE}" CACHE INTERNAL "The ruby executable last queried for version and path info") +@@ -306,7 +301,7 @@ if (Ruby_EXECUTABLE AND NOT Ruby_EXECUTA + set(Ruby_RUBY_LIB_DIR ${Ruby_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir" FORCE) + set(Ruby_SITEARCH_DIR ${Ruby_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir" FORCE) + set(Ruby_SITELIB_DIR ${Ruby_SITELIB_DIR} CACHE PATH "The Ruby site lib dir" FORCE) +- set(Ruby_HAS_VENDOR_RUBY ${Ruby_HAS_VENDOR_RUBY} CACHE BOOL "Vendor Ruby is available" FORCE) ++ set(Ruby_HAS_VENDOR_RUBY $ CACHE BOOL "Vendor Ruby is available" FORCE) + set(Ruby_VENDORARCH_DIR ${Ruby_VENDORARCH_DIR} CACHE PATH "The Ruby vendor arch dir" FORCE) + set(Ruby_VENDORLIB_DIR ${Ruby_VENDORLIB_DIR} CACHE PATH "The Ruby vendor lib dir" FORCE) diff --git a/cmake.spec b/cmake.spec index 487d4c4..5e2f732 100644 --- a/cmake.spec +++ b/cmake.spec @@ -67,15 +67,15 @@ # Setup _vpath_builddir if not defined already %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} -%global major_version 3 -%global minor_version 31 -%global patch_version 6 +%global major_version 4 +%global minor_version 0 +%global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild %global baserelease 1 # Set to RC version if building RC, else comment out. -#%%global rcsuf rc3 +%global rcsuf rc2 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -508,6 +508,8 @@ NO_TEST="$NO_TEST|Qt5Autogen.ManySources|Qt5Autogen.MocInclude|Qt5Autogen.MocInc # Test failing on Fedora 41, only. NO_TEST="$NO_TEST|RunCMake.Make|RunCMake.BuildDepends|Qt6Autogen.RerunMocBasic|Qt6Autogen.RerunRccDepends" %endif +# Drop for v4.0.0-final +NO_TEST="$NO_TEST|RunCMake.LinkWarningAsError" bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure ## do this only periodically, not for every build -- besser82 20221102 # Keep an eye on failing tests @@ -588,6 +590,9 @@ popd %changelog +* Wed Feb 26 2025 Björn Esser - 4.0.0~rc2-1 +- cmake-4.0.0-rc2 + * Mon Feb 24 2025 Björn Esser - 3.31.6-1 - cmake-3.31.6 Fixes rhbz#2347346 diff --git a/sources b/sources index df523b5..e0f5b84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.31.6.tar.gz) = 839d06b6ebd0bf78cbe8f7ae3a7c00026e70d759a81ac51aa103f35ad985ac69be9e667aae7b5fe48c5e0c41baec791259279679dbdf2ddd8b63a48382a8a2a0 +SHA512 (cmake-4.0.0-rc2.tar.gz) = 568aee129e25941767707bad8ae8efe1d82d589df08b273315df22a579f525fb4b4f09ba27825665e5dd16c613e1d85fc33e5e827f13804a33eea6c9fdcc271b From 3604f33f8726e48382aa5d9a733c41479a081cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 26 Feb 2025 23:36:55 +0100 Subject: [PATCH 219/238] tests/cmake-testsuite-sanity: Adapt for new builddir layout --- tests/cmake-testsuite-sanity/runtest.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh index 5853dbf..71b061c 100755 --- a/tests/cmake-testsuite-sanity/runtest.sh +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -57,8 +57,9 @@ rlJournalStart rlRun "dnf builddep -y $TmpDir/SPECS/*.spec" rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/rpmbuild.log" - rlRun "CMakeDir=`ls $TmpDir/BUILD | grep -E '^cmake-[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$' | tail -n 1`" - rlRun "cd $TmpDir/BUILD/$CMakeDir" + rlRun "BuildDir=`ls $TmpDir/BUILD | grep -E '^cmake-[0-9]+(\.[0-9]+)+(_rc[0-9]+)?-build$' | tail -n 1`" + rlRun "CMakeDir=`ls $TmpDir/BUILD/$BuildDir | grep -E '^cmake-[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$' | tail -n 1`" + rlRun "cd $TmpDir/BUILD/$BuildDir/$CMakeDir" rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/bootstrap.log" rlRun "ln -fs /usr/bin/cmake bin/cmake" From c45037a52e8cc8e39a820880a0a55de8d12ec198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 27 Feb 2025 08:58:41 +0100 Subject: [PATCH 220/238] macros.cmake: Restore compatibility with cmake3 macros --- cmake.spec | 5 ++++- macros.cmake.in | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 5e2f732..69760fc 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. %global rcsuf rc2 @@ -590,6 +590,9 @@ popd %changelog +* Thu Feb 27 2025 Björn Esser - 4.0.0~rc2-2 +- Restore compatibility with cmake3 macros + * Wed Feb 26 2025 Björn Esser - 4.0.0~rc2-1 - cmake-4.0.0-rc2 diff --git a/macros.cmake.in b/macros.cmake.in index a2cbd48..0d65e1d 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -61,3 +61,9 @@ %cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install %ctest@@CMAKE_MAJOR_VERSION@@(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \ %ctest %{**} + +# For compatibility with cmake3 macros +%cmake3 %cmake +%cmake3_build %cmake_build +%cmake3_install %cmake_install +%ctest3(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) %ctest %{**} From 1f2cca05f1309726b6ad967e438407d4e80454e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 27 Feb 2025 09:19:57 +0100 Subject: [PATCH 221/238] Rebuild (jsoncpp) --- cmake.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 69760fc..1d1c92d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture -%bcond_with bootstrap +%bcond_without bootstrap # Build with Emacs support %bcond_without emacs @@ -35,7 +35,7 @@ %bcond_without sphinx %if !0%{?rhel} -%bcond_with bundled_jsoncpp +%bcond_without bundled_jsoncpp %bcond_with bundled_rhash %else %bcond_without bundled_jsoncpp @@ -72,7 +72,7 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Set to RC version if building RC, else comment out. %global rcsuf rc2 @@ -590,6 +590,9 @@ popd %changelog +* Thu Feb 27 2025 Björn Esser - 4.0.0~rc2-3 +- Rebuild (jsoncpp) + * Thu Feb 27 2025 Björn Esser - 4.0.0~rc2-2 - Restore compatibility with cmake3 macros From a3a0079a1248ea656abd8cca2afc4dc66d4a826d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 27 Feb 2025 09:32:18 +0100 Subject: [PATCH 222/238] Disable bootstrap build --- cmake.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 1d1c92d..ecaca06 100644 --- a/cmake.spec +++ b/cmake.spec @@ -8,7 +8,7 @@ # Set to bcond_without or use --with bootstrap if bootstrapping a new release # or architecture -%bcond_without bootstrap +%bcond_with bootstrap # Build with Emacs support %bcond_without emacs @@ -35,7 +35,7 @@ %bcond_without sphinx %if !0%{?rhel} -%bcond_without bundled_jsoncpp +%bcond_with bundled_jsoncpp %bcond_with bundled_rhash %else %bcond_without bundled_jsoncpp From 90810d6226a02ef9854bb2243c08b07caa228436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 27 Feb 2025 10:53:35 +0100 Subject: [PATCH 223/238] Provide cmake3 for legacy --- cmake.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake.spec b/cmake.spec index ecaca06..d96732c 100644 --- a/cmake.spec +++ b/cmake.spec @@ -214,6 +214,11 @@ Requires: make # Provide the major version name Provides: %{orig_name}%{major_version} = %{version}-%{release} +# Provide cmake3 for legacy. +%if 0%{?major_version} > 3 +Provides: %{orig_name}3 = %{version}-%{release} +%endif + # Source/kwsys/MD5.c # see https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries Provides: bundled(md5-deutsch) @@ -592,6 +597,7 @@ popd %changelog * Thu Feb 27 2025 Björn Esser - 4.0.0~rc2-3 - Rebuild (jsoncpp) +- Provide cmake3 for legacy * Thu Feb 27 2025 Björn Esser - 4.0.0~rc2-2 - Restore compatibility with cmake3 macros From d8fe77bab98b15952b6e49a4e81392d965df0ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 6 Mar 2025 10:16:21 +0100 Subject: [PATCH 224/238] cmake-4.0.0-rc3 --- cmake.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index d96732c..8354877 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,10 +72,10 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 1 # Set to RC version if building RC, else comment out. -%global rcsuf rc2 +%global rcsuf rc3 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -595,6 +595,9 @@ popd %changelog +* Thu Mar 06 2025 Björn Esser - 4.0.0~rc3-1 +- cmake-4.0.0-rc3 + * Thu Feb 27 2025 Björn Esser - 4.0.0~rc2-3 - Rebuild (jsoncpp) - Provide cmake3 for legacy diff --git a/sources b/sources index e0f5b84..133d661 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-4.0.0-rc2.tar.gz) = 568aee129e25941767707bad8ae8efe1d82d589df08b273315df22a579f525fb4b4f09ba27825665e5dd16c613e1d85fc33e5e827f13804a33eea6c9fdcc271b +SHA512 (cmake-4.0.0-rc3.tar.gz) = 69814a171a5210b8d54e5c1e80e713b5f208f90e145eeaada1be8508c209a660e4cad03aa0b174b17844e922288a9490dddca164e99409e37821e5ab3b5c4dee From ae4f1fd8691c484b09cf526dde74b67d12bdd9e3 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Fri, 7 Mar 2025 11:58:10 +0100 Subject: [PATCH 225/238] Drop non-standard `*_INSTALL` options Signed-off-by: Cristian Le --- cmake.spec | 5 ++++- macros.cmake.in | 8 -------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/cmake.spec b/cmake.spec index 8354877..7f419df 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. %global rcsuf rc3 @@ -595,6 +595,9 @@ popd %changelog +* Fri Mar 07 2025 Cristian Le - 4.0.0~rc3-2 +- Drop non-standard *_INSTALL options + * Thu Mar 06 2025 Björn Esser - 4.0.0~rc3-1 - cmake-4.0.0-rc3 diff --git a/macros.cmake.in b/macros.cmake.in index 0d65e1d..deb8484 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -1,7 +1,6 @@ # # Macros for cmake # -%_cmake_lib_suffix64 -DLIB_SUFFIX=64 %_cmake_shared_libs -DBUILD_SHARED_LIBS:BOOL=ON %_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON %_cmake_version @@CMAKE_VERSION@@ @@ -30,13 +29,6 @@ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DCMAKE_INSTALL_FULL_SBINDIR:PATH=%{_sbindir} \\\ -DCMAKE_INSTALL_SBINDIR:PATH=%(s=%{_sbindir}; echo ${s##*/}) \\\ - -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ - -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ - -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ - -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ -%if "%{?_lib}" == "lib64" \ - %{?_cmake_lib_suffix64} \\\ -%endif \ %{?_cmake_shared_libs} %cmake_build \ From 66fb93f9767d0f8285b821e9f2d278f66b63b53e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 7 Mar 2025 15:24:51 -0500 Subject: [PATCH 226/238] Define CMAKE_POLICY_VERSION_MINIMUM in %cmake cmake 4.0 drops compatibility with CMake < 3.5, meaning that any packages with an earlier CMAKE_MINIMUM_REQUIRED will fail. In many cases though, no further modification is required to build with newer versions, includes 4.0. As such, overriding this by policy will avoid the need for patching a lot of packages to fix their builds. https://cmake.org/cmake/help/latest/variable/CMAKE_POLICY_VERSION_MINIMUM.html https://cmake.org/cmake/help/latest/command/cmake_minimum_required.html#policy-version --- cmake.spec | 5 ++++- macros.cmake.in | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 7f419df..f97af28 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Set to RC version if building RC, else comment out. %global rcsuf rc3 @@ -595,6 +595,9 @@ popd %changelog +* Fri Mar 07 2025 Yaakov Selkowitz - 4.0.0~rc3-3 +- Define CMAKE_POLICY_VERSION_MINIMUM in %%cmake + * Fri Mar 07 2025 Cristian Le - 4.0.0~rc3-2 - Drop non-standard *_INSTALL options diff --git a/macros.cmake.in b/macros.cmake.in index deb8484..dac98f4 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -16,6 +16,7 @@ # - Turn off stripping by default so RPM can do it separately # - Set default install prefixes and library install directories # - Turn on shared libraries by default +# - Avoid errors in packages with CMAKE_MINIMUM_REQUIRED < 3.5 %cmake \ %{set_build_flags} \ %__cmake \\\ @@ -29,6 +30,7 @@ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DCMAKE_INSTALL_FULL_SBINDIR:PATH=%{_sbindir} \\\ -DCMAKE_INSTALL_SBINDIR:PATH=%(s=%{_sbindir}; echo ${s##*/}) \\\ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \\\ %{?_cmake_shared_libs} %cmake_build \ From 8d9eeb10dfce45c7e28a6fa985e5e43b474f9a37 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 11 Mar 2025 08:26:52 -0400 Subject: [PATCH 227/238] Set CMAKE_POLICY_VERSION_MINIMUM as environment variable While passing this as a cmake argument works for top-level projects, it does not carry over automatically to subprojects. Setting this in the environment works for both. --- macros.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.cmake.in b/macros.cmake.in index dac98f4..e42ca1c 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -19,6 +19,7 @@ # - Avoid errors in packages with CMAKE_MINIMUM_REQUIRED < 3.5 %cmake \ %{set_build_flags} \ + export CMAKE_POLICY_VERSION_MINIMUM=3.5 \ %__cmake \\\ %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\ %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\ @@ -30,7 +31,6 @@ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DCMAKE_INSTALL_FULL_SBINDIR:PATH=%{_sbindir} \\\ -DCMAKE_INSTALL_SBINDIR:PATH=%(s=%{_sbindir}; echo ${s##*/}) \\\ - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \\\ %{?_cmake_shared_libs} %cmake_build \ From ff50d850d5d1c36e00e346c3382f5146cc0fe43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 12 Mar 2025 11:07:02 +0100 Subject: [PATCH 228/238] macros: Set CMAKE_POLICY_VERSION_MINIMUM as environment variable --- cmake.spec | 5 ++++- macros.cmake.in | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index f97af28..b13db20 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Set to RC version if building RC, else comment out. %global rcsuf rc3 @@ -595,6 +595,9 @@ popd %changelog +* Wed Mar 12 2025 Björn Esser - 4.0.0~rc3-4 +- macros: Set CMAKE_POLICY_VERSION_MINIMUM as environment variable + * Fri Mar 07 2025 Yaakov Selkowitz - 4.0.0~rc3-3 - Define CMAKE_POLICY_VERSION_MINIMUM in %%cmake diff --git a/macros.cmake.in b/macros.cmake.in index e42ca1c..aafc191 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -19,7 +19,8 @@ # - Avoid errors in packages with CMAKE_MINIMUM_REQUIRED < 3.5 %cmake \ %{set_build_flags} \ - export CMAKE_POLICY_VERSION_MINIMUM=3.5 \ + CMAKE_POLICY_VERSION_MINIMUM="${CMAKE_POLICY_VERSION_MINIMUM:-3.5}" \ + export CMAKE_POLICY_VERSION_MINIMUM \ %__cmake \\\ %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\ %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\ From 696e959fd59baea593a4bbbe98c5595930e55063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 12 Mar 2025 11:14:26 +0100 Subject: [PATCH 229/238] cmake-4.0.0-rc4 --- cmake.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index b13db20..f9ae3e9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,10 +72,10 @@ %global patch_version 0 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 4 +%global baserelease 1 # Set to RC version if building RC, else comment out. -%global rcsuf rc3 +%global rcsuf rc4 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -595,6 +595,9 @@ popd %changelog +* Wed Mar 12 2025 Björn Esser - 4.0.0~rc4-1 +- cmake-4.0.0-rc4 + * Wed Mar 12 2025 Björn Esser - 4.0.0~rc3-4 - macros: Set CMAKE_POLICY_VERSION_MINIMUM as environment variable diff --git a/sources b/sources index 133d661..4d2d3a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-4.0.0-rc3.tar.gz) = 69814a171a5210b8d54e5c1e80e713b5f208f90e145eeaada1be8508c209a660e4cad03aa0b174b17844e922288a9490dddca164e99409e37821e5ab3b5c4dee +SHA512 (cmake-4.0.0-rc4.tar.gz) = a2325e22f23bd62a048b6e9e9c2b6c069260b510169686ee69e45fe1596b53947bef449b32c14471ecc94840d8275e5fe3de89dd63b2aa9e7bdcbd7972e5a457 From 4a9c46f9360f9ebb41b745952ccee580619e5d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 12 Mar 2025 18:55:02 +0100 Subject: [PATCH 230/238] Exclude RunCMake.ParseImplicitLinkInfo from tests --- cmake.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index f9ae3e9..28140b5 100644 --- a/cmake.spec +++ b/cmake.spec @@ -514,7 +514,7 @@ NO_TEST="$NO_TEST|Qt5Autogen.ManySources|Qt5Autogen.MocInclude|Qt5Autogen.MocInc NO_TEST="$NO_TEST|RunCMake.Make|RunCMake.BuildDepends|Qt6Autogen.RerunMocBasic|Qt6Autogen.RerunRccDepends" %endif # Drop for v4.0.0-final -NO_TEST="$NO_TEST|RunCMake.LinkWarningAsError" +NO_TEST="$NO_TEST|RunCMake.LinkWarningAsError|RunCMake.ParseImplicitLinkInfo" bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure ## do this only periodically, not for every build -- besser82 20221102 # Keep an eye on failing tests From b3bf0e8abc8fcae9e27f11a1dcbe872848e0eb32 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 18 Mar 2025 18:38:42 -0400 Subject: [PATCH 231/238] Revert to 3.31.6 Rebuild (jsoncpp) Fix build with latest curl https://pagure.io/fesco/issue/3377 --- cmake-curl-fix.patch | 33 ++++++++++++++++++ cmake-findruby.patch | 26 +++++--------- cmake.spec | 46 ++++++------------------- macros.cmake.in | 17 +++++---- sources | 2 +- tests/cmake-testsuite-sanity/runtest.sh | 5 ++- 6 files changed, 64 insertions(+), 65 deletions(-) create mode 100644 cmake-curl-fix.patch diff --git a/cmake-curl-fix.patch b/cmake-curl-fix.patch new file mode 100644 index 0000000..118733f --- /dev/null +++ b/cmake-curl-fix.patch @@ -0,0 +1,33 @@ +From 1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Mon, 10 Mar 2025 11:08:42 -0400 +Subject: [PATCH] cmCurl: Avoid using undocumented type for CURLOPT_NETRC + values + +Since upstream curl commit `2ec00372a1` (curl.h: change some enums to +defines with L suffix, 2025-02-25), the `CURL_NETRC_*` constants are +integer literals instead of `enum CURL_NETRC_OPTION`. It turns out +that `curl_easy_setopt` has always expected a `long` anyway, and +that `CURL_NETRC_OPTION` is not documented for public use. + +Fixes: #26754 +--- + Source/cmCurl.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx +index b9133ed7d47..0cf8a71a72d 100644 +--- a/Source/cmCurl.cxx ++++ b/Source/cmCurl.cxx +@@ -170,7 +170,7 @@ std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level, + const std::string& netrc_file) + { + std::string e; +- CURL_NETRC_OPTION curl_netrc_level = CURL_NETRC_LAST; ++ long curl_netrc_level = CURL_NETRC_LAST; + ::CURLcode res; + + if (!netrc_level.empty()) { +-- +GitLab + diff --git a/cmake-findruby.patch b/cmake-findruby.patch index 5de08ee..8a06752 100644 --- a/cmake-findruby.patch +++ b/cmake-findruby.patch @@ -1,30 +1,22 @@ -Index: cmake-4.0.0-rc2/Modules/FindRuby.cmake +Index: cmake-3.31.4/Modules/FindRuby.cmake =================================================================== ---- cmake-4.0.0-rc2.orig/Modules/FindRuby.cmake -+++ cmake-4.0.0-rc2/Modules/FindRuby.cmake -@@ -285,14 +285,9 @@ if (Ruby_EXECUTABLE AND NOT Ruby_EXECUTA +--- 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) - # vendor_ruby available ? - execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'" -- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET) +- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET) - -- if (Ruby_HAS_VENDOR_RUBY) +- if(Ruby_HAS_VENDOR_RUBY) - _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) - _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) -- endif () -+# vendor_ruby +- endif() ++ # vendor_ruby + _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR) + _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR) # save the results in the cache so we don't have to run ruby the next time again - set(_Ruby_EXECUTABLE_LAST_QUERIED "${Ruby_EXECUTABLE}" CACHE INTERNAL "The ruby executable last queried for version and path info") -@@ -306,7 +301,7 @@ if (Ruby_EXECUTABLE AND NOT Ruby_EXECUTA - set(Ruby_RUBY_LIB_DIR ${Ruby_RUBY_LIB_DIR} CACHE PATH "The Ruby ruby-lib dir" FORCE) - set(Ruby_SITEARCH_DIR ${Ruby_SITEARCH_DIR} CACHE PATH "The Ruby site arch dir" FORCE) - set(Ruby_SITELIB_DIR ${Ruby_SITELIB_DIR} CACHE PATH "The Ruby site lib dir" FORCE) -- set(Ruby_HAS_VENDOR_RUBY ${Ruby_HAS_VENDOR_RUBY} CACHE BOOL "Vendor Ruby is available" FORCE) -+ set(Ruby_HAS_VENDOR_RUBY $ CACHE BOOL "Vendor Ruby is available" FORCE) - set(Ruby_VENDORARCH_DIR ${Ruby_VENDORARCH_DIR} CACHE PATH "The Ruby vendor arch dir" FORCE) - set(Ruby_VENDORLIB_DIR ${Ruby_VENDORLIB_DIR} CACHE PATH "The Ruby vendor lib dir" FORCE) + set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) diff --git a/cmake.spec b/cmake.spec index 28140b5..021f29b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -67,15 +67,15 @@ # Setup _vpath_builddir if not defined already %{!?_vpath_builddir:%global _vpath_builddir %{_target_platform}} -%global major_version 4 -%global minor_version 0 -%global patch_version 0 +%global major_version 3 +%global minor_version 31 +%global patch_version 6 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. -%global rcsuf rc4 +#%%global rcsuf rc3 %if 0%{?rcsuf:1} %global pkg_version %{major_version}.%{minor_version}.%{patch_version}~%{rcsuf} @@ -117,6 +117,9 @@ Source5: %{name}.req # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch +# Fix build with latest curl +# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10449 +Patch101: %{name}-curl-fix.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -214,11 +217,6 @@ Requires: make # Provide the major version name Provides: %{orig_name}%{major_version} = %{version}-%{release} -# Provide cmake3 for legacy. -%if 0%{?major_version} > 3 -Provides: %{orig_name}3 = %{version}-%{release} -%endif - # Source/kwsys/MD5.c # see https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries Provides: bundled(md5-deutsch) @@ -513,8 +511,6 @@ NO_TEST="$NO_TEST|Qt5Autogen.ManySources|Qt5Autogen.MocInclude|Qt5Autogen.MocInc # Test failing on Fedora 41, only. NO_TEST="$NO_TEST|RunCMake.Make|RunCMake.BuildDepends|Qt6Autogen.RerunMocBasic|Qt6Autogen.RerunRccDepends" %endif -# Drop for v4.0.0-final -NO_TEST="$NO_TEST|RunCMake.LinkWarningAsError|RunCMake.ParseImplicitLinkInfo" bin/ctest%{?name_suffix} %{?_smp_mflags} -V -E "$NO_TEST" --output-on-failure ## do this only periodically, not for every build -- besser82 20221102 # Keep an eye on failing tests @@ -595,30 +591,10 @@ popd %changelog -* Wed Mar 12 2025 Björn Esser - 4.0.0~rc4-1 -- cmake-4.0.0-rc4 - -* Wed Mar 12 2025 Björn Esser - 4.0.0~rc3-4 -- macros: Set CMAKE_POLICY_VERSION_MINIMUM as environment variable - -* Fri Mar 07 2025 Yaakov Selkowitz - 4.0.0~rc3-3 -- Define CMAKE_POLICY_VERSION_MINIMUM in %%cmake - -* Fri Mar 07 2025 Cristian Le - 4.0.0~rc3-2 -- Drop non-standard *_INSTALL options - -* Thu Mar 06 2025 Björn Esser - 4.0.0~rc3-1 -- cmake-4.0.0-rc3 - -* Thu Feb 27 2025 Björn Esser - 4.0.0~rc2-3 +* Tue Mar 18 2025 Yaakov Selkowitz - 3.31.6-2 +- Revert to 3.31.6 - Rebuild (jsoncpp) -- Provide cmake3 for legacy - -* Thu Feb 27 2025 Björn Esser - 4.0.0~rc2-2 -- Restore compatibility with cmake3 macros - -* Wed Feb 26 2025 Björn Esser - 4.0.0~rc2-1 -- cmake-4.0.0-rc2 +- Fix build with latest curl * Mon Feb 24 2025 Björn Esser - 3.31.6-1 - cmake-3.31.6 diff --git a/macros.cmake.in b/macros.cmake.in index aafc191..a2cbd48 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -1,6 +1,7 @@ # # Macros for cmake # +%_cmake_lib_suffix64 -DLIB_SUFFIX=64 %_cmake_shared_libs -DBUILD_SHARED_LIBS:BOOL=ON %_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON %_cmake_version @@CMAKE_VERSION@@ @@ -16,11 +17,8 @@ # - Turn off stripping by default so RPM can do it separately # - Set default install prefixes and library install directories # - Turn on shared libraries by default -# - Avoid errors in packages with CMAKE_MINIMUM_REQUIRED < 3.5 %cmake \ %{set_build_flags} \ - CMAKE_POLICY_VERSION_MINIMUM="${CMAKE_POLICY_VERSION_MINIMUM:-3.5}" \ - export CMAKE_POLICY_VERSION_MINIMUM \ %__cmake \\\ %{!?__cmake_in_source_build:-S "%{_vpath_srcdir}"} \\\ %{!?__cmake_in_source_build:-B "%{__cmake_builddir}"} \\\ @@ -32,6 +30,13 @@ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DCMAKE_INSTALL_FULL_SBINDIR:PATH=%{_sbindir} \\\ -DCMAKE_INSTALL_SBINDIR:PATH=%(s=%{_sbindir}; echo ${s##*/}) \\\ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ + -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ +%if "%{?_lib}" == "lib64" \ + %{?_cmake_lib_suffix64} \\\ +%endif \ %{?_cmake_shared_libs} %cmake_build \ @@ -56,9 +61,3 @@ %cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install %ctest@@CMAKE_MAJOR_VERSION@@(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) \ %ctest %{**} - -# For compatibility with cmake3 macros -%cmake3 %cmake -%cmake3_build %cmake_build -%cmake3_install %cmake_install -%ctest3(:-:h:j:u:v:A:C:D:E:F:H:I:L:M:N:O:Q:R:S:T:U:V:) %ctest %{**} diff --git a/sources b/sources index 4d2d3a4..df523b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-4.0.0-rc4.tar.gz) = a2325e22f23bd62a048b6e9e9c2b6c069260b510169686ee69e45fe1596b53947bef449b32c14471ecc94840d8275e5fe3de89dd63b2aa9e7bdcbd7972e5a457 +SHA512 (cmake-3.31.6.tar.gz) = 839d06b6ebd0bf78cbe8f7ae3a7c00026e70d759a81ac51aa103f35ad985ac69be9e667aae7b5fe48c5e0c41baec791259279679dbdf2ddd8b63a48382a8a2a0 diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh index 71b061c..5853dbf 100755 --- a/tests/cmake-testsuite-sanity/runtest.sh +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -57,9 +57,8 @@ rlJournalStart rlRun "dnf builddep -y $TmpDir/SPECS/*.spec" rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/rpmbuild.log" - rlRun "BuildDir=`ls $TmpDir/BUILD | grep -E '^cmake-[0-9]+(\.[0-9]+)+(_rc[0-9]+)?-build$' | tail -n 1`" - rlRun "CMakeDir=`ls $TmpDir/BUILD/$BuildDir | grep -E '^cmake-[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$' | tail -n 1`" - rlRun "cd $TmpDir/BUILD/$BuildDir/$CMakeDir" + rlRun "CMakeDir=`ls $TmpDir/BUILD | grep -E '^cmake-[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$' | tail -n 1`" + rlRun "cd $TmpDir/BUILD/$CMakeDir" rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/bootstrap.log" rlRun "ln -fs /usr/bin/cmake bin/cmake" From 851a4c373df8251daf6162016cbfd5acc92fb4d6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 11:00:58 +0200 Subject: [PATCH 232/238] Rebuilt for Python 3.14 --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index 021f29b..d2d60e8 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 6 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -591,6 +591,9 @@ popd %changelog +* Tue Jun 03 2025 Python Maint - 3.31.6-3 +- Rebuilt for Python 3.14 + * Tue Mar 18 2025 Yaakov Selkowitz - 3.31.6-2 - Revert to 3.31.6 - Rebuild (jsoncpp) From 864529c3fb76e5ee7a67809f32746091b75aede5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:26:49 +0000 Subject: [PATCH 233/238] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- cmake.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake.spec b/cmake.spec index d2d60e8..5a322d6 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 6 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 3 +%global baserelease 4 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -591,6 +591,9 @@ popd %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.31.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 3.31.6-3 - Rebuilt for Python 3.14 From e615fbe99754926fba8c106dd584418a473abab0 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 2 Dec 2025 16:38:10 -0500 Subject: [PATCH 234/238] Update to 3.31.10 --- cmake-curl-fix.patch | 33 --------------------------------- cmake.spec | 10 +++++----- sources | 2 +- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 cmake-curl-fix.patch diff --git a/cmake-curl-fix.patch b/cmake-curl-fix.patch deleted file mode 100644 index 118733f..0000000 --- a/cmake-curl-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Mon, 10 Mar 2025 11:08:42 -0400 -Subject: [PATCH] cmCurl: Avoid using undocumented type for CURLOPT_NETRC - values - -Since upstream curl commit `2ec00372a1` (curl.h: change some enums to -defines with L suffix, 2025-02-25), the `CURL_NETRC_*` constants are -integer literals instead of `enum CURL_NETRC_OPTION`. It turns out -that `curl_easy_setopt` has always expected a `long` anyway, and -that `CURL_NETRC_OPTION` is not documented for public use. - -Fixes: #26754 ---- - Source/cmCurl.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx -index b9133ed7d47..0cf8a71a72d 100644 ---- a/Source/cmCurl.cxx -+++ b/Source/cmCurl.cxx -@@ -170,7 +170,7 @@ std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level, - const std::string& netrc_file) - { - std::string e; -- CURL_NETRC_OPTION curl_netrc_level = CURL_NETRC_LAST; -+ long curl_netrc_level = CURL_NETRC_LAST; - ::CURLcode res; - - if (!netrc_level.empty()) { --- -GitLab - diff --git a/cmake.spec b/cmake.spec index 5a322d6..60ad2b9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,10 +69,10 @@ %global major_version 3 %global minor_version 31 -%global patch_version 6 +%global patch_version 10 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 4 +%global baserelease 1 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -117,9 +117,6 @@ Source5: %{name}.req # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 Patch100: %{name}-findruby.patch -# Fix build with latest curl -# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10449 -Patch101: %{name}-curl-fix.patch # Patch for renaming on EPEL %if 0%{?name_suffix:1} @@ -591,6 +588,9 @@ popd %changelog +* Tue Dec 02 2025 Yaakov Selkowitz - 3.31.10-1 +- Update to 3.31.10 + * Wed Jul 23 2025 Fedora Release Engineering - 3.31.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index df523b5..5f1214c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cmake-3.31.6.tar.gz) = 839d06b6ebd0bf78cbe8f7ae3a7c00026e70d759a81ac51aa103f35ad985ac69be9e667aae7b5fe48c5e0c41baec791259279679dbdf2ddd8b63a48382a8a2a0 +SHA512 (cmake-3.31.10.tar.gz) = ae1eed42c143b5afd70124853367dab130b3a668fd161a8fd794a44d2eb42f0a64367d152eb43edbf167ffa95612ffe10f8f18c6db9410ff473b97d4f04a978e From 063d6e7fc93eab7cac9331b863345cee49e67141 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 11 Dec 2025 12:19:12 -0800 Subject: [PATCH 235/238] cmake-testsuite-sanity: fix for RPM 4.19.90 build dir change See https://github.com/rpm-software-management/rpm/issues/3147 for the background. RPM 4.19.90 changed RPM's build directory behavior; the tl;dr is that everything's one level deeper now. This code was expecting something like: /tmp/tmp.dheZFHDA0M/BUILD/cmake-3.31.10 but now we actually get something like: /tmp/tmp.dheZFHDA0M/BUILD/cmake-3.31.10-build/cmake-3.31.10 this uses the trick from https://github.com/rpm-software-management/rpm/issues/3147#issuecomment-2154192419 to figure out the base build directory and then go from there, which *should* make this work on both older and newer RPM. Without this fix, the tests are failing like this: :: [ 21:03:33 ] :: [ BEGIN ] :: Running 'CMakeDir=' :: [ 21:03:33 ] :: [ PASS ] :: Command 'CMakeDir=' (Expected 0, got 0) :: [ 21:03:33 ] :: [ BEGIN ] :: Running 'cd /tmp/tmp.dheZFHDA0M/BUILD/' :: [ 21:03:33 ] :: [ PASS ] :: Command 'cd /tmp/tmp.dheZFHDA0M/BUILD/' (Expected 0, got 0) :: [ 21:03:33 ] :: [ BEGIN ] :: Running 'su -c './bootstrap &>/tmp/tmp.dheZFHDA0M/bootstrap.log' cmkbld' :: [ 21:03:33 ] :: [ FAIL ] :: Command 'su -c './bootstrap &>/tmp/tmp.dheZFHDA0M/bootstrap.log' cmkbld' (Expected 0, got 127) you can see it doesn't get the directory right - it's trying to run `./bootstrap` in `/tmp/tmp.dheZFHDA0M/BUILD/`, because the attempt to discover `CMakeDir` failed and returned an empty string. That's never going to work. See: https://artifacts.dev.testing-farm.io/974c2a93-5d4c-4896-a48a-b2a54d2dd01d/ Signed-off-by: Adam Williamson --- tests/cmake-testsuite-sanity/runtest.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/cmake-testsuite-sanity/runtest.sh b/tests/cmake-testsuite-sanity/runtest.sh index 5853dbf..5753827 100755 --- a/tests/cmake-testsuite-sanity/runtest.sh +++ b/tests/cmake-testsuite-sanity/runtest.sh @@ -57,8 +57,9 @@ rlJournalStart rlRun "dnf builddep -y $TmpDir/SPECS/*.spec" rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/rpmbuild.log" - rlRun "CMakeDir=`ls $TmpDir/BUILD | grep -E '^cmake-[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$' | tail -n 1`" - rlRun "cd $TmpDir/BUILD/$CMakeDir" + rlRun "BuildDir=`rpmbuild -D \"_topdir $TmpDir\" -bc --short-circuit --define '__spec_build_pre echo %{_builddir}; exit 0' $TmpDir/SPECS/*.spec | tail -1`" + rlRun "CMakeDir=`ls $BuildDir | grep -E '^cmake-[0-9]+(\.[0-9]+)+(-rc[0-9]+)?$' | tail -n 1`" + rlRun "cd $BuildDir/$CMakeDir" rlRun "su -c './bootstrap &>$TmpDir/bootstrap.log' $BUILD_USER" rlRun "rlFileSubmit $TmpDir/bootstrap.log" rlRun "ln -fs /usr/bin/cmake bin/cmake" From 3445533b7573d49f24560001c4e5cc6e5a75d559 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 18 Nov 2025 02:43:28 -0500 Subject: [PATCH 236/238] macros: Add section comment explaining cmakeX macros --- macros.cmake.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/macros.cmake.in b/macros.cmake.in index a2cbd48..9a3db0c 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -56,6 +56,8 @@ %{lua:print((string.gsub(rpm.expand('%{**}'),"%-%-%s","")))} +# Legacy cmakeX macros for multiversioned CMake + %cmake@@CMAKE_MAJOR_VERSION@@ %cmake %cmake@@CMAKE_MAJOR_VERSION@@_build %cmake_build %cmake@@CMAKE_MAJOR_VERSION@@_install %cmake_install From fef4fab786da32b44525636032fc7bf770791e9f Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 11 Dec 2025 17:08:07 -0500 Subject: [PATCH 237/238] macros: Enable support for RPM 4.20+ declarative buildsystem feature The new cmake-srpm-macros package definition is required for supporting Koji and COPR's two-stage build process where the SRPM isn't made in the full build environment. --- cmake.spec | 43 +++++++++++++++++++++++++++++-------------- macros.aaa-cmake-srpm | 12 ++++++++++++ macros.cmake.in | 11 +++++++++++ 3 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 macros.aaa-cmake-srpm diff --git a/cmake.spec b/cmake.spec index 60ad2b9..05724ca 100644 --- a/cmake.spec +++ b/cmake.spec @@ -58,9 +58,6 @@ %global build_fflags %(echo '%{build_fflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g') %global build_fcflags %(echo '%{build_fflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g') -# Place rpm-macros into proper location -%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) - # Setup _pkgdocdir if not defined already %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -72,7 +69,7 @@ %global patch_version 10 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -104,10 +101,11 @@ URL: http://www.cmake.org Source0: http://www.cmake.org/files/v%{major_version}.%{minor_version}/%{orig_name}-%{tar_version}.tar.gz Source1: %{name}-init.el Source2: macros.%{name}.in +Source3: macros.aaa-%{name}-srpm # See https://bugzilla.redhat.com/show_bug.cgi?id=1202899 -Source3: %{name}.attr -Source4: %{name}.prov -Source5: %{name}.req +Source4: %{name}.attr +Source5: %{name}.prov +Source6: %{name}.req # Always start regular patches with numbers >= 100. # We need lower numbers for patches in compat package. @@ -288,6 +286,16 @@ BuildArch: noarch This package contains common RPM macros for %{name}. +%package srpm-macros +Summary: Common SRPM macros for %{name} +Requires: rpm + +BuildArch: noarch + +%description srpm-macros +This package contains common SRPM macros for %{name}. + + %package -n python3-cmake Summary: Python metadata for packages depending on %{name} Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -310,8 +318,8 @@ echo '#!%{__python3}' > %{name}.req echo '#!%{__python2}' > %{name}.prov echo '#!%{__python2}' > %{name}.req %endif -tail -n +2 %{SOURCE4} >> %{name}.prov -tail -n +2 %{SOURCE5} >> %{name}.req +tail -n +2 %{SOURCE5} >> %{name}.prov +tail -n +2 %{SOURCE6} >> %{name}.req %endif @@ -387,12 +395,13 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} rm -f %{buildroot}%{_emacs_sitelispdir} %endif # RPM macros -install -p -m0644 -D %{SOURCE2} %{buildroot}%{rpm_macros_dir}/macros.%{name} -sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" -e "s|@@CMAKE_MAJOR_VERSION@@|%{major_version}|" %{buildroot}%{rpm_macros_dir}/macros.%{name} -touch -r %{SOURCE2} %{buildroot}%{rpm_macros_dir}/macros.%{name} +install -p -m0644 -D %{SOURCE2} %{buildroot}%{_rpmmacrodir}/macros.%{name} +install -p -m0644 -D %{SOURCE3} %{buildroot}%{_rpmmacrodir}/macros.aaa-%{name}-srpm +sed -i -e "s|@@CMAKE_VERSION@@|%{version}|" -e "s|@@CMAKE_MAJOR_VERSION@@|%{major_version}|" %{buildroot}%{_rpmmacrodir}/macros.%{name} +touch -r %{SOURCE2} %{buildroot}%{_rpmmacrodir}/macros.%{name} %if %{with rpm} && 0%{?_rpmconfigdir:1} # RPM auto provides -install -p -m0644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/rpm/fileattrs/%{name}.attr +install -p -m0644 -D %{SOURCE4} %{buildroot}%{_prefix}/lib/rpm/fileattrs/%{name}.attr install -p -m0755 -D %{name}.prov %{buildroot}%{_prefix}/lib/rpm/%{name}.prov install -p -m0755 -D %{name}.req %{buildroot}%{_prefix}/lib/rpm/%{name}.req %endif @@ -575,19 +584,25 @@ popd %files rpm-macros -%{rpm_macros_dir}/macros.%{name} +%{_rpmmacrodir}/macros.%{name} %if %{with rpm} && 0%{?_rpmconfigdir:1} %{_rpmconfigdir}/fileattrs/%{name}.attr %{_rpmconfigdir}/%{name}.prov %{_rpmconfigdir}/%{name}.req %endif +%files srpm-macros +%{_rpmmacrodir}/macros.aaa-%{name}-srpm + %files -n python3-cmake %{python3_sitelib}/%{cmake_distinfo} %changelog +* Thu Dec 11 2025 Neal Gompa - 3.31.10-2 +- macros: Enable support for RPM 4.20+ declarative buildsystem feature + * Tue Dec 02 2025 Yaakov Selkowitz - 3.31.10-1 - Update to 3.31.10 diff --git a/macros.aaa-cmake-srpm b/macros.aaa-cmake-srpm new file mode 100644 index 0000000..e62f0fb --- /dev/null +++ b/macros.aaa-cmake-srpm @@ -0,0 +1,12 @@ +# Declarative buildsystem macros (usable with rpm >= 4.20) +# https://rpm-software-management.github.io/rpm/manual/buildsystem.html + +# When this file is installed but macros.cmake is not, +# this macro will just cause the real macros to get installed. +%cmake_generate_buildrequires(-) echo "cmake-rpm-macros" + +%buildsystem_cmake_generate_buildrequires() %cmake_generate_buildrequires %{*} +%buildsystem_cmake_conf() %{nil} +%buildsystem_cmake_build() %{nil} +%buildsystem_cmake_install() %{nil} +%buildsystem_cmake_check() %{nil} diff --git a/macros.cmake.in b/macros.cmake.in index 9a3db0c..6c260fd 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -56,6 +56,17 @@ %{lua:print((string.gsub(rpm.expand('%{**}'),"%-%-%s","")))} +# Declarative buildsystem macros (usable with rpm >= 4.20) +# https://rpm-software-management.github.io/rpm/manual/buildsystem.html +%cmake_generate_buildrequires(-) echo "cmake" + +%buildsystem_cmake_generate_buildrequires() %cmake_generate_buildrequires %{*} +%buildsystem_cmake_conf() %cmake %{*} +%buildsystem_cmake_build() %cmake_build %{*} +%buildsystem_cmake_install() %cmake_install %{*} +%buildsystem_cmake_check() %{?with_ctest:%ctest %{*}} %{!?with_ctest:%{nil}} + + # Legacy cmakeX macros for multiversioned CMake %cmake@@CMAKE_MAJOR_VERSION@@ %cmake From aaa289ec8e04448b1b35e24f7b5d9edf0fad135a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 12 Dec 2025 14:28:38 +0100 Subject: [PATCH 238/238] Declarative %generate_buildrequires: Keep the BRs stable Make the rpm-macros implementation add new BuildRequires, but not removing some. This makes the individual rounds of %generate_buildrequires behave more predictably. Nothing says the previous approach is wrong, but is might blow up unexpectedly. --- cmake.spec | 5 ++++- macros.cmake.in | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 05724ca..0bd47ae 100644 --- a/cmake.spec +++ b/cmake.spec @@ -69,7 +69,7 @@ %global patch_version 10 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Set to RC version if building RC, else comment out. #%%global rcsuf rc3 @@ -600,6 +600,9 @@ popd %changelog +* Fri Dec 12 2025 Miro Hrončok - 3.31.10-3 +- Declarative %%generate_buildrequires: Keep the BRs stable + * Thu Dec 11 2025 Neal Gompa - 3.31.10-2 - macros: Enable support for RPM 4.20+ declarative buildsystem feature diff --git a/macros.cmake.in b/macros.cmake.in index 6c260fd..3eb0ef5 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -58,7 +58,7 @@ # Declarative buildsystem macros (usable with rpm >= 4.20) # https://rpm-software-management.github.io/rpm/manual/buildsystem.html -%cmake_generate_buildrequires(-) echo "cmake" +%cmake_generate_buildrequires(-) echo "cmake-rpm-macros"; echo "cmake" %buildsystem_cmake_generate_buildrequires() %cmake_generate_buildrequires %{*} %buildsystem_cmake_conf() %cmake %{*}