| Message ID | 20250630104104.4093207-4-Moritz.Haase@bmw.de |
|---|---|
| State | New |
| Headers | show |
| Series | cmake: Major version bump to 4.0.3 | expand |
Hello, Le lun. 30 juin 2025 à 12:42, Moritz Haase via lists.openembedded.org <Moritz.Haase=bmw.de@lists.openembedded.org> a écrit : > This is the first major release bump for CMake since 3.0 was released in > 2014. > Compatibility with versions of CMake older than 3.5 has been removed. Full > release notes are available at [0]. > Thanks! Out of curiosity (because we will soon find out), do we know how much of meta-openembedded does "Compatibility with versions of CMake older than 3.5 has been removed" break? > Obsolete patches have been removed and the few remaining ones have been > refreshed. We can now build cmake without patches, only cmake-native > requires > two that are not suitable for upstreaming. > > The main license file has been renamed from Copyright.txt to LICENSE.rst > in [1]. > References to the file have been updated, causing changes to the licensing > header in 'cmake.h' (see [2]). > > Additionally, the '1996 - 2024' copyright statement in (cm)curl's COPYING > was > updated to '1996 - 2025' in [3]. > > [0]: https://cmake.org/cmake/help/v4.0/release/4.0.html > [1]: > https://gitlab.kitware.com/cmake/cmake/-/commit/2d42a5444f859891b6598c76ea5d51510013565e > [2]: > https://gitlab.kitware.com/cmake/cmake/-/commit/de273b2e115974a012a6204ffee046dc9ce77586 > [3]: > https://gitlab.kitware.com/cmake/cmake/-/commit/48b13baebc7f99442c3b872f202efd2fb92d6d7f > > License-Update: License file renamed; copyright years updated > Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> > CC: alex.kanavin@gmail.com > --- > changes in v2: > - Squashed license update into this commit to keep bisectability > - Fixed patchtest findings > > --- > > ...native_3.31.6.bb => cmake-native_4.0.3.bb} | 6 +- > meta/recipes-devtools/cmake/cmake.inc | 8 +- > ...mpilerABI-Strip-pipe-from-compile-fl.patch | 63 ------ > ...xt2fs-ext2_fs.h-by-cmake-s-internal.patch} | 4 +- > ...ng-undocumented-type-for-CURLOPT_NET.patch | 30 --- > ...trary-characters-in-test-names-of-CT.patch | 202 ------------------ > ...-CMakeLists.txt-disable-USE_NGHTTP2.patch} | 6 +- > .../cmake/{cmake_3.31.6.bb => cmake_4.0.3.bb} | 1 - > 8 files changed, 11 insertions(+), 309 deletions(-) > rename meta/recipes-devtools/cmake/{cmake-native_3.31.6.bb => > cmake-native_4.0.3.bb} (90%) > delete mode 100644 > meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch > rename > meta/recipes-devtools/cmake/cmake/{0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch > => 0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch} (90%) > delete mode 100644 > meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch > delete mode 100644 > meta/recipes-devtools/cmake/cmake/0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch > rename > meta/recipes-devtools/cmake/cmake/{0001-CMakeLists.txt-disable-USE_NGHTTP2.patch > => 0002-CMakeLists.txt-disable-USE_NGHTTP2.patch} (83%) > rename meta/recipes-devtools/cmake/{cmake_3.31.6.bb => cmake_4.0.3.bb} > (96%) > > diff --git a/meta/recipes-devtools/cmake/cmake-native_3.31.6.bb > b/meta/recipes-devtools/cmake/cmake-native_4.0.3.bb > similarity index 90% > rename from meta/recipes-devtools/cmake/cmake-native_3.31.6.bb > rename to meta/recipes-devtools/cmake/cmake-native_4.0.3.bb > index b940abb3fd..7b90bff52f 100644 > --- a/meta/recipes-devtools/cmake/cmake-native_3.31.6.bb > +++ b/meta/recipes-devtools/cmake/cmake-native_4.0.3.bb > @@ -5,8 +5,8 @@ DEPENDS += "bzip2-replacement-native xz-native zlib-native > ncurses-native zstd-n > > SRC_URI += "file://OEToolchainConfig.cmake \ > file://environment.d-cmake.sh \ > - > file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \ > - file://0001-CMakeLists.txt-disable-USE_NGHTTP2.patch \ > + > file://0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch \ > + file://0002-CMakeLists.txt-disable-USE_NGHTTP2.patch \ > " > > LICENSE:append = " & BSD-1-Clause & MIT & BSD-2-Clause & curl" > @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM:append = " \ > file://Utilities/cmexpat/COPYING;md5=7b3b078238d0901d3b339289117cb7fb > \ > > file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \ > file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d > \ > - file://Utilities/cmcurl/COPYING;md5=eed2e5088e1ac619c9a1c747da291d75 \ > + file://Utilities/cmcurl/COPYING;md5=72f4e9890e99e68d77b7e40703d789b8 \ > " > > B = "${WORKDIR}/build" > diff --git a/meta/recipes-devtools/cmake/cmake.inc > b/meta/recipes-devtools/cmake/cmake.inc > index 9b1898f22f..a15dfd3bb4 100644 > --- a/meta/recipes-devtools/cmake/cmake.inc > +++ b/meta/recipes-devtools/cmake/cmake.inc > @@ -10,18 +10,16 @@ HOMEPAGE = "http://www.cmake.org/" > BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" > SECTION = "console/utils" > LICENSE = "BSD-3-Clause" > -LIC_FILES_CHKSUM = > "file://Copyright.txt;md5=718f05155941b33862726348d3cd46ce \ > - > file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b > \ > +LIC_FILES_CHKSUM = > "file://LICENSE.rst;md5=0cafc0f3b6b28f3d5ecb5d1a68c36471 \ > + > file://Source/cmake.h;beginline=1;endline=2;md5=4ba59ac0e953e1a713eea8c55b1d531b > \ > " > > CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" > > SRC_URI = " > https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ > - > file://0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch \ > - > file://0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch \ > " > > -SRC_URI[sha256sum] = > "653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0" > +SRC_URI[sha256sum] = > "8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb" > > UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" > > diff --git > a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch > b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch > deleted file mode 100644 > index 3895c7e03b..0000000000 > --- > a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch > +++ /dev/null > @@ -1,63 +0,0 @@ > -From e4061151ac13bc727512d961a80faca3ceb22b5a Mon Sep 17 00:00:00 2001 > -From: Philip Lorenz <philip.lorenz@bmw.de> > -Date: Mon, 3 Jun 2024 13:19:24 +0200 > -Subject: [PATCH] CMakeDetermineCompilerABI: Strip -pipe from compile flags > - > -When `-pipe` is enabled, GCC passes data between its different > -executables using pipes instead of temporary files. This leads to issues > -when cmake attempts to infer compiler internals via the `-v` parameter > -as each executable will print to `stderr` in parallel. > - > -For example we have observed the following outputs in our builds which > -sporadically lead to build failures as system include directories were > -not detected reliably: > - > -Parsed CXX implicit include dir info from above output: rv=done > - found start of include info > - found start of implicit include info > - add: > [.../usr/bin/x86_64-poky-linux/../../lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.4.0/include] > - add: > [.../usr/bin/x86_64-poky-linux/../../lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.4.0/include-fixed] > - add: [.../usr/include/c++/11.4.0] > - add: [.../usr/include/c++/11.4.0/x86_64-poky-linux] > - add: [.../usr/include/c++/11.4.0/backward] > - add: [.../usr/lib/x86_64-poky-linux/11.4.0/include] > - add: [...GNU assembler version 2.38 (x86_64-poky-linux) using BFD > version (GNU Binutils) 2.38.20220708] > - add: [/usr/include] > - end of search list found > - > -Fix this issue by stripping the `-pipe` parameter from the compilation > -flag when determining the toolchain configuration. > - > -Upstream-Status: Backport [3.32.0, > 71be059f3f32b6791427893a48ba4815a19e2e78] > -Signed-off-by: Philip Lorenz <philip.lorenz@bmw.de> > ---- > - Modules/CMakeDetermineCompilerABI.cmake | 9 ++++++++- > - 1 file changed, 8 insertions(+), 1 deletion(-) > - > -diff --git a/Modules/CMakeDetermineCompilerABI.cmake > b/Modules/CMakeDetermineCompilerABI.cmake > -index 4a75e25a..806f0b71 100644 > ---- a/Modules/CMakeDetermineCompilerABI.cmake > -+++ b/Modules/CMakeDetermineCompilerABI.cmake > -@@ -52,14 +52,21 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src) > - > - __TestCompiler_setTryCompileTargetType() > - > -- # Avoid failing ABI detection on warnings. > -+ # Avoid failing ABI detection caused by non-functionally relevant > -+ # compiler arguments > - if(CMAKE_TRY_COMPILE_CONFIGURATION) > - string(TOUPPER "${CMAKE_TRY_COMPILE_CONFIGURATION}" _tc_config) > - else() > - set(_tc_config "DEBUG") > - endif() > - foreach(v CMAKE_${lang}_FLAGS CMAKE_${lang}_FLAGS_${_tc_config}) > -+ # Avoid failing ABI detection on warnings. > - string(REGEX REPLACE "(^| )-Werror([= ][^-][^ ]*)?( |$)" " " ${v} > "${${v}}") > -+ # Avoid passing of "-pipe" when determining the compiler > internals. With > -+ # "-pipe" GCC will use pipes to pass data between the involved > -+ # executables. This may lead to issues when their stderr output > (which > -+ # contains the relevant compiler internals) becomes interweaved. > -+ string(REGEX REPLACE "(^| )-pipe( |$)" " " ${v} "${${v}}") > - endforeach() > - > - # Save the current LC_ALL, LC_MESSAGES, and LANG environment > variables > diff --git > a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch > b/meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch > similarity index 90% > rename from > meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch > rename to > meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch > index 7559c52932..f31dce5644 100644 > --- > a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch > +++ > b/meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch > @@ -1,4 +1,4 @@ > -From 8effa783e47e2b574be90733c38b27701e06e929 Mon Sep 17 00:00:00 2001 > +From cf8210696ebbaff14612d845bc98fac447c0e6f5 Mon Sep 17 00:00:00 2001 > From: Otavio Salvador <otavio@ossystems.com.br> > Date: Thu, 5 Jul 2018 10:28:04 -0300 > Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal > @@ -18,7 +18,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/Utilities/cmlibarchive/CMakeLists.txt > b/Utilities/cmlibarchive/CMakeLists.txt > -index 4e4b49c1..50e9a733 100644 > +index > 04d986b6ea7d8dc0bd7e909d4e7b4e73c9e35437..014fe78063f7d30c9a4970b7cf3aeeaeb36bcdbc > 100644 > --- a/Utilities/cmlibarchive/CMakeLists.txt > +++ b/Utilities/cmlibarchive/CMakeLists.txt > @@ -745,12 +745,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) > diff --git > a/meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch > b/meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch > deleted file mode 100644 > index c719c1fdfb..0000000000 > --- > a/meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch > +++ /dev/null > @@ -1,30 +0,0 @@ > -From c608975f4490f67872926f2601e5c37f2e570307 Mon Sep 17 00:00:00 2001 > -From: Wang Mingyu <wangmy@fujitsu.com> > -Date: Wed, 9 Apr 2025 01:40:46 +0000 > -Subject: [PATCH] cmCurl: Avoid using undocumented type for CURLOPT_NETRC > - values > - > -Fix: nativesdk-cmake/3.31.6/cmake-3.31.6/Source/cmCurl.cxx:178:26: error: > invalid conversion from 'long int' to 'CURL_NETRC_OPTION' [-fpermissive] > -Upstream-Status: Backport [ > https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10449/diffs?commit_id=1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd > ] > - > -Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > ---- > - Source/cmCurl.cxx | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx > -index b9133ed7..0cf8a71a 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()) { > --- > -2.43.0 > - > diff --git > a/meta/recipes-devtools/cmake/cmake/0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch > b/meta/recipes-devtools/cmake/cmake/0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch > deleted file mode 100644 > index 31f6148cac..0000000000 > --- > a/meta/recipes-devtools/cmake/cmake/0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch > +++ /dev/null > @@ -1,202 +0,0 @@ > -From c7e8b03324883760a2d6fab86ae034beb82af651 Mon Sep 17 00:00:00 2001 > -From: John Drouhard <john@drouhard.dev> > -Date: Thu, 9 Jan 2025 20:34:42 -0600 > -Subject: [PATCH] ctest: Allow arbitrary characters in test names of > - CTestCostData.txt > - > -This changes the way lines in CTestCostData.txt are parsed to allow for > -spaces in the test name. > - > -It does so by looking for space characters from the end; and once two > -have been found, assumes everything from the beginning up to that > -second-to-last-space is the test name. > - > -Additionally, parsing the file should be much more efficient since there > -is no string or vector heap allocation per line. The std::string used by > -the parse function to convert the int and float should be within most > -standard libraries' small string optimization. > - > -Fixes: #26594 > - > -Upstream-Status: Backport [4.0.0, > 040da7d83216ace59710407e8ce35d5fd38e1340] > -Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> > ---- > - Source/CTest/cmCTestMultiProcessHandler.cxx | 77 +++++++++++++++------ > - Source/CTest/cmCTestMultiProcessHandler.h | 3 +- > - Tests/CTestTestScheduler/CMakeLists.txt | 4 +- > - 3 files changed, 61 insertions(+), 23 deletions(-) > - > -diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx > b/Source/CTest/cmCTestMultiProcessHandler.cxx > -index > 84ea32b84d40025ec333a90d30c42eeaf7adc9ef..231e7b5f39b1d8aa75f4e59a890a099b53fcdaac > 100644 > ---- a/Source/CTest/cmCTestMultiProcessHandler.cxx > -+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx > -@@ -20,6 +20,7 @@ > - > - #include <cm/memory> > - #include <cm/optional> > -+#include <cm/string_view> > - #include <cmext/algorithm> > - > - #include <cm3p/json/value.h> > -@@ -52,6 +53,48 @@ constexpr unsigned long kParallelLevelMinimum = 2u; > - // Under a job server, parallelism is effectively limited > - // only by available job server tokens. > - constexpr unsigned long kParallelLevelUnbounded = 0x10000u; > -+ > -+struct CostEntry > -+{ > -+ cm::string_view name; > -+ int prevRuns; > -+ float cost; > -+}; > -+ > -+cm::optional<CostEntry> splitCostLine(cm::string_view line) > -+{ > -+ std::string part; > -+ cm::string_view::size_type pos1 = line.size(); > -+ cm::string_view::size_type pos2 = line.find_last_of(' ', pos1); > -+ auto findNext = [line, &part, &pos1, &pos2]() -> bool { > -+ if (pos2 != cm::string_view::npos) { > -+ cm::string_view sub = line.substr(pos2 + 1, pos1 - pos2 - 1); > -+ part.assign(sub.begin(), sub.end()); > -+ pos1 = pos2; > -+ if (pos1 > 0) { > -+ pos2 = line.find_last_of(' ', pos1 - 1); > -+ } > -+ return true; > -+ } > -+ return false; > -+ }; > -+ > -+ // parse the cost > -+ if (!findNext()) { > -+ return cm::nullopt; > -+ } > -+ float cost = static_cast<float>(atof(part.c_str())); > -+ > -+ // parse the previous runs > -+ if (!findNext()) { > -+ return cm::nullopt; > -+ } > -+ int prev = atoi(part.c_str()); > -+ > -+ // from start to the last found space is the name > -+ return CostEntry{ line.substr(0, pos1), prev, cost }; > -+} > -+ > - } > - > - namespace cmsys { > -@@ -797,24 +840,21 @@ void cmCTestMultiProcessHandler::UpdateCostData() > - if (line == "---") { > - break; > - } > -- std::vector<std::string> parts = cmSystemTools::SplitString(line, > ' '); > - // Format: <name> <previous_runs> <avg_cost> > -- if (parts.size() < 3) { > -+ cm::optional<CostEntry> entry = splitCostLine(line); > -+ if (!entry) { > - break; > - } > - > -- std::string name = parts[0]; > -- int prev = atoi(parts[1].c_str()); > -- float cost = static_cast<float>(atof(parts[2].c_str())); > -- > -- int index = this->SearchByName(name); > -+ int index = this->SearchByName(entry->name); > - if (index == -1) { > - // This test is not in memory. We just rewrite the entry > -- fout << name << " " << prev << " " << cost << "\n"; > -+ fout << entry->name << " " << entry->prevRuns << " " << > entry->cost > -+ << "\n"; > - } else { > - // Update with our new average cost > -- fout << name << " " << this->Properties[index]->PreviousRuns << > " " > -- << this->Properties[index]->Cost << "\n"; > -+ fout << entry->name << " " << > this->Properties[index]->PreviousRuns > -+ << " " << this->Properties[index]->Cost << "\n"; > - temp.erase(index); > - } > - } > -@@ -850,28 +890,25 @@ void cmCTestMultiProcessHandler::ReadCostData() > - break; > - } > - > -- std::vector<std::string> parts = cmSystemTools::SplitString(line, > ' '); > -+ // Format: <name> <previous_runs> <avg_cost> > -+ cm::optional<CostEntry> entry = splitCostLine(line); > - > - // Probably an older version of the file, will be fixed next run > -- if (parts.size() < 3) { > -+ if (!entry) { > - fin.close(); > - return; > - } > - > -- std::string name = parts[0]; > -- int prev = atoi(parts[1].c_str()); > -- float cost = static_cast<float>(atof(parts[2].c_str())); > -- > -- int index = this->SearchByName(name); > -+ int index = this->SearchByName(entry->name); > - if (index == -1) { > - continue; > - } > - > -- this->Properties[index]->PreviousRuns = prev; > -+ this->Properties[index]->PreviousRuns = entry->prevRuns; > - // When not running in parallel mode, don't use cost data > - if (this->GetParallelLevel() > 1 && this->Properties[index] && > - this->Properties[index]->Cost == 0) { > -- this->Properties[index]->Cost = cost; > -+ this->Properties[index]->Cost = entry->cost; > - } > - } > - // Next part of the file is the failed tests > -@@ -884,7 +921,7 @@ void cmCTestMultiProcessHandler::ReadCostData() > - } > - } > - > --int cmCTestMultiProcessHandler::SearchByName(std::string const& name) > -+int cmCTestMultiProcessHandler::SearchByName(cm::string_view name) > - { > - int index = -1; > - > -diff --git a/Source/CTest/cmCTestMultiProcessHandler.h > b/Source/CTest/cmCTestMultiProcessHandler.h > -index > fd6c17f2fac06949c20f3792dd3eae442b15850b..811be613c3387240c0181f8372b24cf09219621f > 100644 > ---- a/Source/CTest/cmCTestMultiProcessHandler.h > -+++ b/Source/CTest/cmCTestMultiProcessHandler.h > -@@ -13,6 +13,7 @@ > - #include <vector> > - > - #include <cm/optional> > -+#include <cm/string_view> > - > - #include "cmCTest.h" > - #include "cmCTestResourceAllocator.h" > -@@ -110,7 +111,7 @@ protected: > - void UpdateCostData(); > - void ReadCostData(); > - // Return index of a test based on its name > -- int SearchByName(std::string const& name); > -+ int SearchByName(cm::string_view name); > - > - void CreateTestCostList(); > - > -diff --git a/Tests/CTestTestScheduler/CMakeLists.txt > b/Tests/CTestTestScheduler/CMakeLists.txt > -index > 6f8cb4dbc0de35984540e1868788e0a02124e819..daf6ce2b23d8c048334ae1047759130b246dccef > 100644 > ---- a/Tests/CTestTestScheduler/CMakeLists.txt > -+++ b/Tests/CTestTestScheduler/CMakeLists.txt > -@@ -1,9 +1,9 @@ > --cmake_minimum_required(VERSION 3.10) > -+cmake_minimum_required(VERSION 3.19) > - project (CTestTestScheduler) > - include (CTest) > - > - add_executable (Sleep sleep.c) > - > - foreach (time RANGE 1 4) > -- add_test (TestSleep${time} Sleep ${time}) > -+ add_test ("TestSleep ${time}" Sleep ${time}) > - endforeach () > diff --git > a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch > b/meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch > similarity index 83% > rename from > meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch > rename to > meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch > index ab78fa26ba..158eea2c3e 100644 > --- > a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch > +++ > b/meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch > @@ -1,4 +1,4 @@ > -From 061253f390ada0661b30cf8856fa8d8d40a7355d Mon Sep 17 00:00:00 2001 > +From e0a1996a85dcb43d69d3c7daecab4da74599e5ba Mon Sep 17 00:00:00 2001 > From: Changqing Li <changqing.li@windriver.com> > Date: Wed, 28 Dec 2022 17:51:27 +0800 > Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 > @@ -22,10 +22,10 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Utilities/cmcurl/CMakeLists.txt > b/Utilities/cmcurl/CMakeLists.txt > -index ef6c269e..ecaac497 100644 > +index > 75b510205984894ffa11461e7aa04d3c479709b4..83463042d82d9c7f17932753f47c47b12aeec85b > 100644 > --- a/Utilities/cmcurl/CMakeLists.txt > +++ b/Utilities/cmcurl/CMakeLists.txt > -@@ -99,7 +99,7 @@ set(USE_ECH OFF) > +@@ -105,7 +105,7 @@ set(USE_ECH OFF) > set(USE_HTTPSRR OFF) > set(USE_LIBIDN2 ON) > set(USE_LIBRTMP OFF) > diff --git a/meta/recipes-devtools/cmake/cmake_3.31.6.bb > b/meta/recipes-devtools/cmake/cmake_4.0.3.bb > similarity index 96% > rename from meta/recipes-devtools/cmake/cmake_3.31.6.bb > rename to meta/recipes-devtools/cmake/cmake_4.0.3.bb > index 2d343d6f52..7d8b8cac65 100644 > --- a/meta/recipes-devtools/cmake/cmake_3.31.6.bb > +++ b/meta/recipes-devtools/cmake/cmake_4.0.3.bb > @@ -5,7 +5,6 @@ inherit cmake bash-completion > DEPENDS += "curl expat zlib libarchive xz ncurses bzip2" > > SRC_URI:append:class-nativesdk = " \ > - > file://0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch \ > file://OEToolchainConfig.cmake \ > file://SDKToolchainConfig.cmake.template \ > file://cmake-setup.py \ > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#219506): > https://lists.openembedded.org/g/openembedded-core/message/219506 > Mute This Topic: https://lists.openembedded.org/mt/113905486/4316185 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > yoann.congal@smile.fr] > -=-=-=-=-=-=-=-=-=-=-=- > >
On Mon, 30 Jun 2025 at 12:51, Yoann Congal <yoann.congal@smile.fr> wrote:
> Out of curiosity (because we will soon find out), do we know how much of meta-openembedded does "Compatibility with versions of CMake older than 3.5 has been removed" break?
I do not think this is a fair question, and it is asked too soon
indeed. It implies that the submitter should set up an (extremely
heavy) world build with all of meta-oe, and possibly makes them
obliged to fix the fallout. Neither is expected from Moritz, just to
be clear.
Alex
Le lun. 30 juin 2025 à 13:05, Alexander Kanavin <alex.kanavin@gmail.com> a écrit : > On Mon, 30 Jun 2025 at 12:51, Yoann Congal <yoann.congal@smile.fr> wrote: > > Out of curiosity (because we will soon find out), do we know how much of > meta-openembedded does "Compatibility with versions of CMake older than 3.5 > has been removed" break? > > I do not think this is a fair question, and it is asked too soon > indeed. It implies that the submitter should set up an (extremely > heavy) world build with all of meta-oe, and possibly makes them > obliged to fix the fallout. Neither is expected from Moritz, just to > be clear. > Oh! Sorry I wasn't clearer! I was not expecting that from Moritz as well : Neither the world build nor the fixes for the inevitable fallout. I have nothing against the patch. I'll try to be more cautious next time. > > Alex >
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.31.6.bb b/meta/recipes-devtools/cmake/cmake-native_4.0.3.bb similarity index 90% rename from meta/recipes-devtools/cmake/cmake-native_3.31.6.bb rename to meta/recipes-devtools/cmake/cmake-native_4.0.3.bb index b940abb3fd..7b90bff52f 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.31.6.bb +++ b/meta/recipes-devtools/cmake/cmake-native_4.0.3.bb @@ -5,8 +5,8 @@ DEPENDS += "bzip2-replacement-native xz-native zlib-native ncurses-native zstd-n SRC_URI += "file://OEToolchainConfig.cmake \ file://environment.d-cmake.sh \ - file://0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch \ - file://0001-CMakeLists.txt-disable-USE_NGHTTP2.patch \ + file://0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch \ + file://0002-CMakeLists.txt-disable-USE_NGHTTP2.patch \ " LICENSE:append = " & BSD-1-Clause & MIT & BSD-2-Clause & curl" @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM:append = " \ file://Utilities/cmexpat/COPYING;md5=7b3b078238d0901d3b339289117cb7fb \ file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \ file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \ - file://Utilities/cmcurl/COPYING;md5=eed2e5088e1ac619c9a1c747da291d75 \ + file://Utilities/cmcurl/COPYING;md5=72f4e9890e99e68d77b7e40703d789b8 \ " B = "${WORKDIR}/build" diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 9b1898f22f..a15dfd3bb4 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -10,18 +10,16 @@ HOMEPAGE = "http://www.cmake.org/" BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=718f05155941b33862726348d3cd46ce \ - file://Source/cmake.h;beginline=1;endline=2;md5=a5f70e1fef8614734eae0d62b4f5891b \ +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=0cafc0f3b6b28f3d5ecb5d1a68c36471 \ + file://Source/cmake.h;beginline=1;endline=2;md5=4ba59ac0e953e1a713eea8c55b1d531b \ " CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ - file://0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch \ - file://0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch \ " -SRC_URI[sha256sum] = "653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0" +SRC_URI[sha256sum] = "8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch deleted file mode 100644 index 3895c7e03b..0000000000 --- a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch +++ /dev/null @@ -1,63 +0,0 @@ -From e4061151ac13bc727512d961a80faca3ceb22b5a Mon Sep 17 00:00:00 2001 -From: Philip Lorenz <philip.lorenz@bmw.de> -Date: Mon, 3 Jun 2024 13:19:24 +0200 -Subject: [PATCH] CMakeDetermineCompilerABI: Strip -pipe from compile flags - -When `-pipe` is enabled, GCC passes data between its different -executables using pipes instead of temporary files. This leads to issues -when cmake attempts to infer compiler internals via the `-v` parameter -as each executable will print to `stderr` in parallel. - -For example we have observed the following outputs in our builds which -sporadically lead to build failures as system include directories were -not detected reliably: - -Parsed CXX implicit include dir info from above output: rv=done - found start of include info - found start of implicit include info - add: [.../usr/bin/x86_64-poky-linux/../../lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.4.0/include] - add: [.../usr/bin/x86_64-poky-linux/../../lib/x86_64-poky-linux/gcc/x86_64-poky-linux/11.4.0/include-fixed] - add: [.../usr/include/c++/11.4.0] - add: [.../usr/include/c++/11.4.0/x86_64-poky-linux] - add: [.../usr/include/c++/11.4.0/backward] - add: [.../usr/lib/x86_64-poky-linux/11.4.0/include] - add: [...GNU assembler version 2.38 (x86_64-poky-linux) using BFD version (GNU Binutils) 2.38.20220708] - add: [/usr/include] - end of search list found - -Fix this issue by stripping the `-pipe` parameter from the compilation -flag when determining the toolchain configuration. - -Upstream-Status: Backport [3.32.0, 71be059f3f32b6791427893a48ba4815a19e2e78] -Signed-off-by: Philip Lorenz <philip.lorenz@bmw.de> ---- - Modules/CMakeDetermineCompilerABI.cmake | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/Modules/CMakeDetermineCompilerABI.cmake b/Modules/CMakeDetermineCompilerABI.cmake -index 4a75e25a..806f0b71 100644 ---- a/Modules/CMakeDetermineCompilerABI.cmake -+++ b/Modules/CMakeDetermineCompilerABI.cmake -@@ -52,14 +52,21 @@ function(CMAKE_DETERMINE_COMPILER_ABI lang src) - - __TestCompiler_setTryCompileTargetType() - -- # Avoid failing ABI detection on warnings. -+ # Avoid failing ABI detection caused by non-functionally relevant -+ # compiler arguments - if(CMAKE_TRY_COMPILE_CONFIGURATION) - string(TOUPPER "${CMAKE_TRY_COMPILE_CONFIGURATION}" _tc_config) - else() - set(_tc_config "DEBUG") - endif() - foreach(v CMAKE_${lang}_FLAGS CMAKE_${lang}_FLAGS_${_tc_config}) -+ # Avoid failing ABI detection on warnings. - string(REGEX REPLACE "(^| )-Werror([= ][^-][^ ]*)?( |$)" " " ${v} "${${v}}") -+ # Avoid passing of "-pipe" when determining the compiler internals. With -+ # "-pipe" GCC will use pipes to pass data between the involved -+ # executables. This may lead to issues when their stderr output (which -+ # contains the relevant compiler internals) becomes interweaved. -+ string(REGEX REPLACE "(^| )-pipe( |$)" " " ${v} "${${v}}") - endforeach() - - # Save the current LC_ALL, LC_MESSAGES, and LANG environment variables diff --git a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch b/meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch similarity index 90% rename from meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch rename to meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch index 7559c52932..f31dce5644 100644 --- a/meta/recipes-devtools/cmake/cmake/0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch +++ b/meta/recipes-devtools/cmake/cmake/0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch @@ -1,4 +1,4 @@ -From 8effa783e47e2b574be90733c38b27701e06e929 Mon Sep 17 00:00:00 2001 +From cf8210696ebbaff14612d845bc98fac447c0e6f5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador <otavio@ossystems.com.br> Date: Thu, 5 Jul 2018 10:28:04 -0300 Subject: [PATCH] Disable use of ext2fs/ext2_fs.h by cmake's internal @@ -18,7 +18,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt -index 4e4b49c1..50e9a733 100644 +index 04d986b6ea7d8dc0bd7e909d4e7b4e73c9e35437..014fe78063f7d30c9a4970b7cf3aeeaeb36bcdbc 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt @@ -745,12 +745,8 @@ LA_CHECK_INCLUDE_FILE("copyfile.h" HAVE_COPYFILE_H) diff --git a/meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch b/meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch deleted file mode 100644 index c719c1fdfb..0000000000 --- a/meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c608975f4490f67872926f2601e5c37f2e570307 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <wangmy@fujitsu.com> -Date: Wed, 9 Apr 2025 01:40:46 +0000 -Subject: [PATCH] cmCurl: Avoid using undocumented type for CURLOPT_NETRC - values - -Fix: nativesdk-cmake/3.31.6/cmake-3.31.6/Source/cmCurl.cxx:178:26: error: invalid conversion from 'long int' to 'CURL_NETRC_OPTION' [-fpermissive] -Upstream-Status: Backport [https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10449/diffs?commit_id=1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd] - -Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> ---- - Source/cmCurl.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx -index b9133ed7..0cf8a71a 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()) { --- -2.43.0 - diff --git a/meta/recipes-devtools/cmake/cmake/0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch b/meta/recipes-devtools/cmake/cmake/0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch deleted file mode 100644 index 31f6148cac..0000000000 --- a/meta/recipes-devtools/cmake/cmake/0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch +++ /dev/null @@ -1,202 +0,0 @@ -From c7e8b03324883760a2d6fab86ae034beb82af651 Mon Sep 17 00:00:00 2001 -From: John Drouhard <john@drouhard.dev> -Date: Thu, 9 Jan 2025 20:34:42 -0600 -Subject: [PATCH] ctest: Allow arbitrary characters in test names of - CTestCostData.txt - -This changes the way lines in CTestCostData.txt are parsed to allow for -spaces in the test name. - -It does so by looking for space characters from the end; and once two -have been found, assumes everything from the beginning up to that -second-to-last-space is the test name. - -Additionally, parsing the file should be much more efficient since there -is no string or vector heap allocation per line. The std::string used by -the parse function to convert the int and float should be within most -standard libraries' small string optimization. - -Fixes: #26594 - -Upstream-Status: Backport [4.0.0, 040da7d83216ace59710407e8ce35d5fd38e1340] -Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> ---- - Source/CTest/cmCTestMultiProcessHandler.cxx | 77 +++++++++++++++------ - Source/CTest/cmCTestMultiProcessHandler.h | 3 +- - Tests/CTestTestScheduler/CMakeLists.txt | 4 +- - 3 files changed, 61 insertions(+), 23 deletions(-) - -diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx -index 84ea32b84d40025ec333a90d30c42eeaf7adc9ef..231e7b5f39b1d8aa75f4e59a890a099b53fcdaac 100644 ---- a/Source/CTest/cmCTestMultiProcessHandler.cxx -+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx -@@ -20,6 +20,7 @@ - - #include <cm/memory> - #include <cm/optional> -+#include <cm/string_view> - #include <cmext/algorithm> - - #include <cm3p/json/value.h> -@@ -52,6 +53,48 @@ constexpr unsigned long kParallelLevelMinimum = 2u; - // Under a job server, parallelism is effectively limited - // only by available job server tokens. - constexpr unsigned long kParallelLevelUnbounded = 0x10000u; -+ -+struct CostEntry -+{ -+ cm::string_view name; -+ int prevRuns; -+ float cost; -+}; -+ -+cm::optional<CostEntry> splitCostLine(cm::string_view line) -+{ -+ std::string part; -+ cm::string_view::size_type pos1 = line.size(); -+ cm::string_view::size_type pos2 = line.find_last_of(' ', pos1); -+ auto findNext = [line, &part, &pos1, &pos2]() -> bool { -+ if (pos2 != cm::string_view::npos) { -+ cm::string_view sub = line.substr(pos2 + 1, pos1 - pos2 - 1); -+ part.assign(sub.begin(), sub.end()); -+ pos1 = pos2; -+ if (pos1 > 0) { -+ pos2 = line.find_last_of(' ', pos1 - 1); -+ } -+ return true; -+ } -+ return false; -+ }; -+ -+ // parse the cost -+ if (!findNext()) { -+ return cm::nullopt; -+ } -+ float cost = static_cast<float>(atof(part.c_str())); -+ -+ // parse the previous runs -+ if (!findNext()) { -+ return cm::nullopt; -+ } -+ int prev = atoi(part.c_str()); -+ -+ // from start to the last found space is the name -+ return CostEntry{ line.substr(0, pos1), prev, cost }; -+} -+ - } - - namespace cmsys { -@@ -797,24 +840,21 @@ void cmCTestMultiProcessHandler::UpdateCostData() - if (line == "---") { - break; - } -- std::vector<std::string> parts = cmSystemTools::SplitString(line, ' '); - // Format: <name> <previous_runs> <avg_cost> -- if (parts.size() < 3) { -+ cm::optional<CostEntry> entry = splitCostLine(line); -+ if (!entry) { - break; - } - -- std::string name = parts[0]; -- int prev = atoi(parts[1].c_str()); -- float cost = static_cast<float>(atof(parts[2].c_str())); -- -- int index = this->SearchByName(name); -+ int index = this->SearchByName(entry->name); - if (index == -1) { - // This test is not in memory. We just rewrite the entry -- fout << name << " " << prev << " " << cost << "\n"; -+ fout << entry->name << " " << entry->prevRuns << " " << entry->cost -+ << "\n"; - } else { - // Update with our new average cost -- fout << name << " " << this->Properties[index]->PreviousRuns << " " -- << this->Properties[index]->Cost << "\n"; -+ fout << entry->name << " " << this->Properties[index]->PreviousRuns -+ << " " << this->Properties[index]->Cost << "\n"; - temp.erase(index); - } - } -@@ -850,28 +890,25 @@ void cmCTestMultiProcessHandler::ReadCostData() - break; - } - -- std::vector<std::string> parts = cmSystemTools::SplitString(line, ' '); -+ // Format: <name> <previous_runs> <avg_cost> -+ cm::optional<CostEntry> entry = splitCostLine(line); - - // Probably an older version of the file, will be fixed next run -- if (parts.size() < 3) { -+ if (!entry) { - fin.close(); - return; - } - -- std::string name = parts[0]; -- int prev = atoi(parts[1].c_str()); -- float cost = static_cast<float>(atof(parts[2].c_str())); -- -- int index = this->SearchByName(name); -+ int index = this->SearchByName(entry->name); - if (index == -1) { - continue; - } - -- this->Properties[index]->PreviousRuns = prev; -+ this->Properties[index]->PreviousRuns = entry->prevRuns; - // When not running in parallel mode, don't use cost data - if (this->GetParallelLevel() > 1 && this->Properties[index] && - this->Properties[index]->Cost == 0) { -- this->Properties[index]->Cost = cost; -+ this->Properties[index]->Cost = entry->cost; - } - } - // Next part of the file is the failed tests -@@ -884,7 +921,7 @@ void cmCTestMultiProcessHandler::ReadCostData() - } - } - --int cmCTestMultiProcessHandler::SearchByName(std::string const& name) -+int cmCTestMultiProcessHandler::SearchByName(cm::string_view name) - { - int index = -1; - -diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h -index fd6c17f2fac06949c20f3792dd3eae442b15850b..811be613c3387240c0181f8372b24cf09219621f 100644 ---- a/Source/CTest/cmCTestMultiProcessHandler.h -+++ b/Source/CTest/cmCTestMultiProcessHandler.h -@@ -13,6 +13,7 @@ - #include <vector> - - #include <cm/optional> -+#include <cm/string_view> - - #include "cmCTest.h" - #include "cmCTestResourceAllocator.h" -@@ -110,7 +111,7 @@ protected: - void UpdateCostData(); - void ReadCostData(); - // Return index of a test based on its name -- int SearchByName(std::string const& name); -+ int SearchByName(cm::string_view name); - - void CreateTestCostList(); - -diff --git a/Tests/CTestTestScheduler/CMakeLists.txt b/Tests/CTestTestScheduler/CMakeLists.txt -index 6f8cb4dbc0de35984540e1868788e0a02124e819..daf6ce2b23d8c048334ae1047759130b246dccef 100644 ---- a/Tests/CTestTestScheduler/CMakeLists.txt -+++ b/Tests/CTestTestScheduler/CMakeLists.txt -@@ -1,9 +1,9 @@ --cmake_minimum_required(VERSION 3.10) -+cmake_minimum_required(VERSION 3.19) - project (CTestTestScheduler) - include (CTest) - - add_executable (Sleep sleep.c) - - foreach (time RANGE 1 4) -- add_test (TestSleep${time} Sleep ${time}) -+ add_test ("TestSleep ${time}" Sleep ${time}) - endforeach () diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch b/meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch similarity index 83% rename from meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch rename to meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch index ab78fa26ba..158eea2c3e 100644 --- a/meta/recipes-devtools/cmake/cmake/0001-CMakeLists.txt-disable-USE_NGHTTP2.patch +++ b/meta/recipes-devtools/cmake/cmake/0002-CMakeLists.txt-disable-USE_NGHTTP2.patch @@ -1,4 +1,4 @@ -From 061253f390ada0661b30cf8856fa8d8d40a7355d Mon Sep 17 00:00:00 2001 +From e0a1996a85dcb43d69d3c7daecab4da74599e5ba Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Wed, 28 Dec 2022 17:51:27 +0800 Subject: [PATCH] CMakeLists.txt: disable USE_NGHTTP2 @@ -22,10 +22,10 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt -index ef6c269e..ecaac497 100644 +index 75b510205984894ffa11461e7aa04d3c479709b4..83463042d82d9c7f17932753f47c47b12aeec85b 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt -@@ -99,7 +99,7 @@ set(USE_ECH OFF) +@@ -105,7 +105,7 @@ set(USE_ECH OFF) set(USE_HTTPSRR OFF) set(USE_LIBIDN2 ON) set(USE_LIBRTMP OFF) diff --git a/meta/recipes-devtools/cmake/cmake_3.31.6.bb b/meta/recipes-devtools/cmake/cmake_4.0.3.bb similarity index 96% rename from meta/recipes-devtools/cmake/cmake_3.31.6.bb rename to meta/recipes-devtools/cmake/cmake_4.0.3.bb index 2d343d6f52..7d8b8cac65 100644 --- a/meta/recipes-devtools/cmake/cmake_3.31.6.bb +++ b/meta/recipes-devtools/cmake/cmake_4.0.3.bb @@ -5,7 +5,6 @@ inherit cmake bash-completion DEPENDS += "curl expat zlib libarchive xz ncurses bzip2" SRC_URI:append:class-nativesdk = " \ - file://0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch \ file://OEToolchainConfig.cmake \ file://SDKToolchainConfig.cmake.template \ file://cmake-setup.py \
This is the first major release bump for CMake since 3.0 was released in 2014. Compatibility with versions of CMake older than 3.5 has been removed. Full release notes are available at [0]. Obsolete patches have been removed and the few remaining ones have been refreshed. We can now build cmake without patches, only cmake-native requires two that are not suitable for upstreaming. The main license file has been renamed from Copyright.txt to LICENSE.rst in [1]. References to the file have been updated, causing changes to the licensing header in 'cmake.h' (see [2]). Additionally, the '1996 - 2024' copyright statement in (cm)curl's COPYING was updated to '1996 - 2025' in [3]. [0]: https://cmake.org/cmake/help/v4.0/release/4.0.html [1]: https://gitlab.kitware.com/cmake/cmake/-/commit/2d42a5444f859891b6598c76ea5d51510013565e [2]: https://gitlab.kitware.com/cmake/cmake/-/commit/de273b2e115974a012a6204ffee046dc9ce77586 [3]: https://gitlab.kitware.com/cmake/cmake/-/commit/48b13baebc7f99442c3b872f202efd2fb92d6d7f License-Update: License file renamed; copyright years updated Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de> CC: alex.kanavin@gmail.com --- changes in v2: - Squashed license update into this commit to keep bisectability - Fixed patchtest findings --- ...native_3.31.6.bb => cmake-native_4.0.3.bb} | 6 +- meta/recipes-devtools/cmake/cmake.inc | 8 +- ...mpilerABI-Strip-pipe-from-compile-fl.patch | 63 ------ ...xt2fs-ext2_fs.h-by-cmake-s-internal.patch} | 4 +- ...ng-undocumented-type-for-CURLOPT_NET.patch | 30 --- ...trary-characters-in-test-names-of-CT.patch | 202 ------------------ ...-CMakeLists.txt-disable-USE_NGHTTP2.patch} | 6 +- .../cmake/{cmake_3.31.6.bb => cmake_4.0.3.bb} | 1 - 8 files changed, 11 insertions(+), 309 deletions(-) rename meta/recipes-devtools/cmake/{cmake-native_3.31.6.bb => cmake-native_4.0.3.bb} (90%) delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineCompilerABI-Strip-pipe-from-compile-fl.patch rename meta/recipes-devtools/cmake/cmake/{0005-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal-.patch => 0001-Disable-use-of-ext2fs-ext2_fs.h-by-cmake-s-internal.patch} (90%) delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-cmCurl-Avoid-using-undocumented-type-for-CURLOPT_NET.patch delete mode 100644 meta/recipes-devtools/cmake/cmake/0001-ctest-Allow-arbitrary-characters-in-test-names-of-CT.patch rename meta/recipes-devtools/cmake/cmake/{0001-CMakeLists.txt-disable-USE_NGHTTP2.patch => 0002-CMakeLists.txt-disable-USE_NGHTTP2.patch} (83%) rename meta/recipes-devtools/cmake/{cmake_3.31.6.bb => cmake_4.0.3.bb} (96%)