From f397300d3d40b655834c465fc82a0ca0fe53bf888eb562a8d8c1485b60535311 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 30 Mar 2022 06:36:07 +0000 Subject: [PATCH] Accepting request 965777 from home:mathletic:branches:devel:tools:building Update to 3.23.0 OBS-URL: https://build.opensuse.org/request/show/965777 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=485 --- cmake-3.22.3-SHA-256.txt | 15 ---- cmake-3.22.3-SHA-256.txt.asc | 16 ----- cmake-3.22.3.tar.gz | 3 - cmake-3.23.0-SHA-256.txt | 15 ++++ cmake-3.23.0-SHA-256.txt.asc | 16 +++++ cmake-3.23.0.tar.gz | 3 + cmake.changes | 17 +++++ cmake.spec | 13 ++-- fix-avoid-file-static-init.patch | 117 ------------------------------- 9 files changed, 59 insertions(+), 156 deletions(-) delete mode 100644 cmake-3.22.3-SHA-256.txt delete mode 100644 cmake-3.22.3-SHA-256.txt.asc delete mode 100644 cmake-3.22.3.tar.gz create mode 100644 cmake-3.23.0-SHA-256.txt create mode 100644 cmake-3.23.0-SHA-256.txt.asc create mode 100644 cmake-3.23.0.tar.gz delete mode 100644 fix-avoid-file-static-init.patch diff --git a/cmake-3.22.3-SHA-256.txt b/cmake-3.22.3-SHA-256.txt deleted file mode 100644 index af71d9a..0000000 --- a/cmake-3.22.3-SHA-256.txt +++ /dev/null @@ -1,15 +0,0 @@ -284e75a607b8602c42d589b62eb1d2cb4ac767509bdc70586465f5638a9d78cf cmake-3.22.3-files-v1.json -11346e25ff0a29f65e73cf77f814d810f4afc1255677c37682ac718ae8fa2b92 cmake-3.22.3-linux-aarch64.sh -76e708318c1bc775e723b365b2d93732c58451cca5abd9cda0833e649382e3ce cmake-3.22.3-linux-aarch64.tar.gz -9439aabc484e2da38a3656b72925ed6ac2e50e30fe212db8b2dd5ff2de66c035 cmake-3.22.3-linux-x86_64.sh -96ace92dfe42b1c6c9c116fdb1c7adc42cb90cbaa87adcebc1a8de7ea129865c cmake-3.22.3-linux-x86_64.tar.gz -f3371c6e95dd75e0b789b73d57f95453678ebdc3546a830e6a3e003f6f94040f cmake-3.22.3-macos-universal.dmg -92b0d5711e13a6a88f0970403edd9b60f2468aebb7e77fb8f3d680b1913dffad cmake-3.22.3-macos-universal.tar.gz -288798689d8d33b0c51599ff3538a654547efa1a64f200b69a3d283690993de6 cmake-3.22.3-macos10.10-universal.dmg -187b618193fce11a973daf6ee4f1360219628c2ca6ff4a2370027695505c9d79 cmake-3.22.3-macos10.10-universal.tar.gz -6336a550e57af46ae7084275aa87e8f602782a922c6ca2eb855d653b30e21ce4 cmake-3.22.3-windows-i386.msi -46604d5e6c150883dc2fb1435b66d3b28754f6dc69b522da03845631a4e3f278 cmake-3.22.3-windows-i386.zip -5bebbd44abc339c02fd525dce7c2931f9668d7d1a4a11e42e32be49301ba3658 cmake-3.22.3-windows-x86_64.msi -0018b369f06646d4784fad131a155333c9d59a03dee6390324f81b9df72a2f00 cmake-3.22.3-windows-x86_64.zip -9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0 cmake-3.22.3.tar.gz -5150b8eefe32562042b464c2d6ba78fa6f2c5cbebb97dca6e52511a14c425c9a cmake-3.22.3.zip diff --git a/cmake-3.22.3-SHA-256.txt.asc b/cmake-3.22.3-SHA-256.txt.asc deleted file mode 100644 index a866df0..0000000 --- a/cmake-3.22.3-SHA-256.txt.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmIiUYYACgkQLSzvEDSS -FoRVyg//VwWfWyhI/YJhBZoOHowhaNLyMhEi0Nus6yAF8mNRF/OmNj8ntfiM9Er6 -vcuk2JtsWTv0tWtepk3mXzyKitd09xzrR5aF4xiUrCZvC9zkGz+Rmw+nIAnoJKXI -lqcoDKHP2mJmcEEkEbCOJs8B571wLRiqm/yQK25MFT9+A7T8vRMwua7V3gU2mLwH -B8agrFc94XzwVkobhwTDo17CyZZJVSqiNrq6kT8lpTKe39rtTyt4jbJawVouq190 -XCcP5pDHmGlCC8+6fLOvyJAFh/m2L7nJeQA0mWmW7hcenExU3mu6atO4T4QuNHCg -UYytUUE01vfo6mKA2za/ocyUfqHkKLb6DnTDV+lKJ9HW79ghqSeGRrzDDDGdKI6W -VcjIpZKBVss5XUbluQkTUd2cn369zl9nHEXupn8a7Q77G43IY9Ct1jai3dXQlFUt -I/em+Dwg4LpRsABo8XxursegrmNLan/kZ7njkEcFdWT4QY66HM2//Uce0Q84VGjZ -iBkJuDc7sNenzVW1AR8Emg0EHkQzy5xta12v9j9DjhnIfR9yjIQ+l3wnMaW0+Zq9 -wBBklIFEl+EqDLmRnNNwn52EMw8PAcNOz3JYirV+sFhDrlZkZXjYYjLeURNQdnAN -ou21KOibPBPg7+UMrU6pOUPTZD2zKivQ5iQyDKysHda7Prse+B0= -=s97F ------END PGP SIGNATURE----- diff --git a/cmake-3.22.3.tar.gz b/cmake-3.22.3.tar.gz deleted file mode 100644 index 8b5e6dd..0000000 --- a/cmake-3.22.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f8469166f94553b6978a16ee29227ec49a2eb5ceb608275dec40d8ae0d1b5a0 -size 9779118 diff --git a/cmake-3.23.0-SHA-256.txt b/cmake-3.23.0-SHA-256.txt new file mode 100644 index 0000000..ffa68b0 --- /dev/null +++ b/cmake-3.23.0-SHA-256.txt @@ -0,0 +1,15 @@ +e37bbbbe3fc8cd2c43961b06b78be9d73d12d619183471a1169a1996e0043556 cmake-3.23.0-files-v1.json +9f8d42ef0b33d1bea47afe15875435dac58503d6a3b58842b473fd811e6df172 cmake-3.23.0-linux-aarch64.sh +17e8589139c363bd536af7a8c283dcf5a48e1631c359337e45a1843a7ac68985 cmake-3.23.0-linux-aarch64.tar.gz +5eaf3ded8255b3d149c7aad68c473f01c2345dce872e03c92f2e9c0185dfa75a cmake-3.23.0-linux-x86_64.sh +83f58ab96af19282cf19deaab942fe7990646ff798e6059d217a1a805d1ecf1b cmake-3.23.0-linux-x86_64.tar.gz +a410fd9615f7f3c2f61456d3cf6b09abc50d51b6b32adf4803b4d63e3c015592 cmake-3.23.0-macos-universal.dmg +db09be78c97721d3b26947f90ac0411ae6cbe7406705cedcc72df9f04b3f79c8 cmake-3.23.0-macos-universal.tar.gz +73fec71ad1c2334f165da35bc79f712e42a0156dc44c69b55124f2ba769233f2 cmake-3.23.0-macos10.10-universal.dmg +f2958a0d92dc839cdbbfd1aa25ee7d42d46e7047a045adcb5f8f6e08833e442b cmake-3.23.0-macos10.10-universal.tar.gz +4f5a4b839fd6dee0362392a34719422e03faa2e039378d086b3a4c1832fff5fe cmake-3.23.0-windows-i386.msi +615a030f8cff0aa1895a8d08fe95a4ddef1b3291a33c192c4c991e9e39b71db0 cmake-3.23.0-windows-i386.zip +1e772025844f1cc648d28f42090038e5ca5cf72e2889de26d8d05ee25da17061 cmake-3.23.0-windows-x86_64.msi +aedbbd88bdd866dccf34280ba26b05e1bc930e26ddc2ebba50e3667cdf4594b8 cmake-3.23.0-windows-x86_64.zip +5ab0a12f702f44013be7e19534cd9094d65cc9fe7b2cd0f8c9e5318e0fe4ac82 cmake-3.23.0.tar.gz +9345b7de8a0469c10880b81b72f96c181e0ec1d134e7747963f0e4f6ad3c443d cmake-3.23.0.zip diff --git a/cmake-3.23.0-SHA-256.txt.asc b/cmake-3.23.0-SHA-256.txt.asc new file mode 100644 index 0000000..4c45fae --- /dev/null +++ b/cmake-3.23.0-SHA-256.txt.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmJDL3kACgkQLSzvEDSS +FoRrMg//Zlzmp0lKSnOcUWwvtJV05FT3mm/UwA52Tyv+LiKiDAkBcf/whuPb8Xln +K6S4LF04mYrpFL9OhiMn4pZrrcH2Zx5OrIKifIZUmsVh2VAbWjU3OVDR1TXe6NzN +zL2KwmU1Idifr8MPunymHqcC0qT80xtaGHBrxC8NxvdVzzIDnmY0pdlwtzQSgO9K +D3IeyrO87lhHzPhbzM3o2XvPnf23n1y5W9iYh+7RIfz3IVIVZbPgbFxMW4vdJB0t +Ex+b+Df3Ycw3kHnV3VrROyRuhHJUellT88LAxQ/qc8tz106+MoKoXlWoTYz3VSoP +jlUvz0w6UnxCFzcp6FsUXGCUojMQ/tytMjM1o3lT4KJet98Py/UclidunZltoDsl ++0DAtLJkEXYnV+2PYggNdxUwkigpt+C0EMa/crvQqrsQTbug6/++ueJzV0FnRQi/ +zTSkvLlA051dVGMT+XCRKKPHKKs23ZMCAEtTj8T9XKTR3tDfZgy+TINPFzmMLZVb +R9Q5NNDTUr22tG+fQ5xtJUD/m8G7kTLo/rL1n9l2r8pQxT1kb0I+riirbdcIi6cI +jT8aWpc72p2hhLQd1rZuH/eIncBRyiGwOBpgCuAyK3NMXzifJFyUpJF+0kKH9/Rf +rPQYlXa2don/1lCucUc+rRrqSQTxztANtPI2X0I6dTL9HFU5+Sc= +=1dpY +-----END PGP SIGNATURE----- diff --git a/cmake-3.23.0.tar.gz b/cmake-3.23.0.tar.gz new file mode 100644 index 0000000..704162d --- /dev/null +++ b/cmake-3.23.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ab0a12f702f44013be7e19534cd9094d65cc9fe7b2cd0f8c9e5318e0fe4ac82 +size 9981221 diff --git a/cmake.changes b/cmake.changes index 3f82528..18953fc 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Mar 29 19:18:02 UTC 2022 - Christoph G + +- Update to 3.23.0 + * "cmake-presets(7)" files now have an optional "include" field, + which allows the files to include other files. + * The "install(TARGETS)" command gained a new "FILE_SET" argument, + which can be used to install header file sets associated with a + target. + * The "target_sources()" command gained a new "FILE_SET" mode, + which can be used to add headers as header-only source files of + a target. + * The "CMAKE_CUDA_ARCHITECTURES" variable and associated + "CUDA_ARCHITECTURES" target property now support the "all", and + "all-major" values for CUDA toolkit 7.0+. +- Drop "fix-avoid-file-static-init.patch" which is part of upstream + ------------------------------------------------------------------- Sun Mar 20 21:08:54 UTC 2022 - Dirk Müller diff --git a/cmake.spec b/cmake.spec index d30efc2..0743cee 100644 --- a/cmake.spec +++ b/cmake.spec @@ -44,9 +44,9 @@ %else %bcond_with full %endif -%define shortversion 3.22 +%define shortversion 3.23 Name: cmake%{?psuffix} -Version: 3.22.3 +Version: 3.23.0 Release: 0 Summary: Cross-platform make system License: BSD-3-Clause @@ -64,8 +64,6 @@ Patch0: cmake-fix-ruby-test.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch1: feature-suse-python-interp-search-order.patch Patch2: cmake-fix-png-include-dir.patch -# boo#1194815 fix from upstream fixes gcc12 builds -Patch3: fix-avoid-file-static-init.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -74,7 +72,9 @@ BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libssl) -BuildRequires: pkgconfig(libuv) >= 1.10 +%if %{suse_version} > 1500 +BuildRequires: pkgconfig(libuv) >= 1.28 +%endif BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(zlib) %if "%{flavor}" == "" @@ -156,6 +156,9 @@ export CXXFLAGS="%{optflags}" %endif --parallel=0%{jobs} \ --verbose \ +%if %{suse_version} < 1550 + --no-system-libuv \ +%endif %if %{with qhelp} --sphinx-qthelp \ %endif diff --git a/fix-avoid-file-static-init.patch b/fix-avoid-file-static-init.patch deleted file mode 100644 index 7a6bfeb..0000000 --- a/fix-avoid-file-static-init.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 54510486bd2378cca7cbb8d4034174a29182ca24 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Thu, 20 Jan 2022 14:06:58 -0500 -Subject: [PATCH] Avoid file-level static initialization with std::vector - -Fixes: #23126 ---- - Source/cmFileAPIToolchains.cxx | 41 ++++++++++------------ - Tests/CMakeLib/testCTestBinPacker.cxx | 5 ++- - Tests/CMakeLib/testCTestResourceGroups.cxx | 2 +- - 3 files changed, 22 insertions(+), 26 deletions(-) - -diff --git a/Source/cmFileAPIToolchains.cxx b/Source/cmFileAPIToolchains.cxx -index b3540c97b2..fe2972fabf 100644 ---- a/Source/cmFileAPIToolchains.cxx -+++ b/Source/cmFileAPIToolchains.cxx -@@ -30,10 +30,6 @@ class Toolchains - cmFileAPI& FileAPI; - unsigned long Version; - -- static const std::vector CompilerVariables; -- static const std::vector CompilerImplicitVariables; -- static const ToolchainVariable SourceFileExtensionsVariable; -- - Json::Value DumpToolchains(); - Json::Value DumpToolchain(std::string const& lang); - Json::Value DumpToolchainVariables( -@@ -48,24 +44,6 @@ public: - Json::Value Dump(); - }; - --const std::vector Toolchains::CompilerVariables{ -- { "path", "COMPILER", false }, -- { "id", "COMPILER_ID", false }, -- { "version", "COMPILER_VERSION", false }, -- { "target", "COMPILER_TARGET", false }, --}; -- --const std::vector Toolchains::CompilerImplicitVariables{ -- { "includeDirectories", "IMPLICIT_INCLUDE_DIRECTORIES", true }, -- { "linkDirectories", "IMPLICIT_LINK_DIRECTORIES", true }, -- { "linkFrameworkDirectories", "IMPLICIT_LINK_FRAMEWORK_DIRECTORIES", true }, -- { "linkLibraries", "IMPLICIT_LINK_LIBRARIES", true }, --}; -- --const ToolchainVariable Toolchains::SourceFileExtensionsVariable{ -- "sourceFileExtensions", "SOURCE_FILE_EXTENSIONS", true --}; -- - Toolchains::Toolchains(cmFileAPI& fileAPI, unsigned long version) - : FileAPI(fileAPI) - , Version(version) -@@ -94,6 +72,25 @@ Json::Value Toolchains::DumpToolchains() - - Json::Value Toolchains::DumpToolchain(std::string const& lang) - { -+ static const std::vector CompilerVariables{ -+ { "path", "COMPILER", false }, -+ { "id", "COMPILER_ID", false }, -+ { "version", "COMPILER_VERSION", false }, -+ { "target", "COMPILER_TARGET", false }, -+ }; -+ -+ static const std::vector CompilerImplicitVariables{ -+ { "includeDirectories", "IMPLICIT_INCLUDE_DIRECTORIES", true }, -+ { "linkDirectories", "IMPLICIT_LINK_DIRECTORIES", true }, -+ { "linkFrameworkDirectories", "IMPLICIT_LINK_FRAMEWORK_DIRECTORIES", -+ true }, -+ { "linkLibraries", "IMPLICIT_LINK_LIBRARIES", true }, -+ }; -+ -+ static const ToolchainVariable SourceFileExtensionsVariable{ -+ "sourceFileExtensions", "SOURCE_FILE_EXTENSIONS", true -+ }; -+ - const auto& mf = - this->FileAPI.GetCMakeInstance()->GetGlobalGenerator()->GetMakefiles()[0]; - Json::Value toolchain = Json::objectValue; -diff --git a/Tests/CMakeLib/testCTestBinPacker.cxx b/Tests/CMakeLib/testCTestBinPacker.cxx -index abdbefb231..e419155665 100644 ---- a/Tests/CMakeLib/testCTestBinPacker.cxx -+++ b/Tests/CMakeLib/testCTestBinPacker.cxx -@@ -16,8 +16,7 @@ struct ExpectedPackResult - std::vector ExpectedBlockAllocations; - }; - --static const std::vector expectedResults --{ -+static const ExpectedPackResult expectedResults[] = { - /* clang-format off */ - { - { 2, 2, 2, 2 }, -@@ -215,7 +214,7 @@ struct AllocationComparison - bool Equal; - }; - --static const std::vector comparisons{ -+static const AllocationComparison comparisons[] = { - /* clang-format off */ - { { 0, 1, "0" }, { 0, 1, "0" }, true }, - { { 0, 1, "0" }, { 1, 1, "0" }, false }, -diff --git a/Tests/CMakeLib/testCTestResourceGroups.cxx b/Tests/CMakeLib/testCTestResourceGroups.cxx -index c3532a68d7..b764c860c5 100644 ---- a/Tests/CMakeLib/testCTestResourceGroups.cxx -+++ b/Tests/CMakeLib/testCTestResourceGroups.cxx -@@ -15,7 +15,7 @@ struct ExpectedParseResult - ExpectedValue; - }; - --static const std::vector expectedResults{ -+static const ExpectedParseResult expectedResults[] = { - /* clang-format off */ - { "threads:2", true, { - { { "threads", 2, 1 } }, --- -GitLab -