diff --git a/.checkpackageignore b/.checkpackageignore index 0b1f71d8c6..973ecfba89 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -244,7 +244,6 @@ package/cfm/S65cfm lib_sysv.Indent lib_sysv.Variables package/cgroupfs-mount/S30cgroupfs Shellcheck lib_sysv.Indent lib_sysv.Variables package/chipmunk/0001-Fix-build-failure-on-musl.patch lib_patch.Upstream package/chrony/S49chronyd lib_sysv.Variables -package/cmake/0001-rename-cmake-rootfile.patch lib_patch.Upstream package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch lib_patch.Upstream package/connman/S45connman lib_sysv.Variables package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch lib_patch.Upstream diff --git a/package/cmake/0001-rename-cmake-rootfile.patch b/package/cmake/0001-rename-cmake-rootfile.patch index c73e0dfe02..72da31c8a3 100644 --- a/package/cmake/0001-rename-cmake-rootfile.patch +++ b/package/cmake/0001-rename-cmake-rootfile.patch @@ -10,9 +10,11 @@ files are removed at build time via the target-finalize rule. This buildroot-specific patch makes sure ctest looks also for "Modules/CMake.cmake.ctest" before complaining +Upstream: N/A (specific to buildroot) + [Vincent: tweak patch for 3.6.3] [James: tweak patch for 3.15.4] -[Bernd: tweak patch for 3.27.0 & 3.31.2] +[Bernd: rebased for 4.3.0] Signed-off-by: Davide Viti Signed-off-by: Vicente Olivert Riera @@ -26,7 +28,7 @@ diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 3772f09985..c317e4af38 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx -@@ -1896,7 +1896,12 @@ int cmake::AddCMakePaths() +@@ -1987,7 +1987,12 @@ int cmake::AddCMakePaths() cmStateEnums::INTERNAL); #endif if (!cmSystemTools::FileExists( @@ -39,7 +41,7 @@ index 3772f09985..c317e4af38 100644 + { // couldn't find modules cmSystemTools::Error( - "Could not find CMAKE_ROOT !!!\n" + cmStrCat("Could not find CMAKE_ROOT !!!\n" -- 2.20.1 diff --git a/package/cmake/Config.in.host b/package/cmake/Config.in.host index 86f93b0ac8..0d96ee2233 100644 --- a/package/cmake/Config.in.host +++ b/package/cmake/Config.in.host @@ -75,10 +75,15 @@ config BR2_HOST_CMAKE_AT_LEAST_4_2 bool select BR2_HOST_CMAKE_AT_LEAST_4_1 +config BR2_HOST_CMAKE_AT_LEAST_4_3 + bool + select BR2_HOST_CMAKE_AT_LEAST_4_2 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_HOST_CMAKE_AT_LEAST string + default "4.3" if BR2_HOST_CMAKE_AT_LEAST_4_3 default "4.2" if BR2_HOST_CMAKE_AT_LEAST_4_2 default "4.1" if BR2_HOST_CMAKE_AT_LEAST_4_1 default "4.0" if BR2_HOST_CMAKE_AT_LEAST_4_0 diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 88744ac703..605bed2a40 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v4.2/cmake-4.2.3-SHA-256.txt -sha256 7efaccde8c5a6b2968bad6ce0fe60e19b6e10701a12fce948c2bf79bac8a11e9 cmake-4.2.3.tar.gz +# From https://cmake.org/files/v4.3/cmake-4.3.0-SHA-256.txt +sha256 f51b3c729f85d8dde46a92c071d2826ea6afb77d850f46894125de7cc51baa77 cmake-4.3.0.tar.gz # Locally calculated -sha256 1e0d48f16c60f400838a96989684ae12cec35cb96688db11e8cb0204058cf4b8 LICENSE.rst +sha256 4382e7c1879ac90e3f101a395d23846fa4dbcaa1eed7265b43681e348754825d LICENSE.rst diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index f5d1787d19..952e8174f4 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -5,8 +5,8 @@ ################################################################################ # When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y -CMAKE_VERSION_MAJOR = 4.2 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 +CMAKE_VERSION_MAJOR = 4.3 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = LICENSE.rst