mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
package/cmake: bump version to 4.3.0
https://cmake.org/cmake/help/v4.3/release/4.3.html
Added Upstream: tag and rebased patch 0001.
Updated license hash due to copyright year bump:
97ad58a86c
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
7fe315a6f7
commit
1148619156
@@ -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/cgroupfs-mount/S30cgroupfs Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||||
package/chipmunk/0001-Fix-build-failure-on-musl.patch lib_patch.Upstream
|
package/chipmunk/0001-Fix-build-failure-on-musl.patch lib_patch.Upstream
|
||||||
package/chrony/S49chronyd lib_sysv.Variables
|
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/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch lib_patch.Upstream
|
||||||
package/connman/S45connman lib_sysv.Variables
|
package/connman/S45connman lib_sysv.Variables
|
||||||
package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch lib_patch.Upstream
|
package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch lib_patch.Upstream
|
||||||
|
|||||||
@@ -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
|
This buildroot-specific patch makes sure ctest looks also for
|
||||||
"Modules/CMake.cmake.ctest" before complaining
|
"Modules/CMake.cmake.ctest" before complaining
|
||||||
|
|
||||||
|
Upstream: N/A (specific to buildroot)
|
||||||
|
|
||||||
[Vincent: tweak patch for 3.6.3]
|
[Vincent: tweak patch for 3.6.3]
|
||||||
[James: tweak patch for 3.15.4]
|
[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 <zinosat@tiscali.it>
|
Signed-off-by: Davide Viti <zinosat@tiscali.it>
|
||||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||||
@@ -26,7 +28,7 @@ diff --git a/Source/cmake.cxx b/Source/cmake.cxx
|
|||||||
index 3772f09985..c317e4af38 100644
|
index 3772f09985..c317e4af38 100644
|
||||||
--- a/Source/cmake.cxx
|
--- a/Source/cmake.cxx
|
||||||
+++ b/Source/cmake.cxx
|
+++ b/Source/cmake.cxx
|
||||||
@@ -1896,7 +1896,12 @@ int cmake::AddCMakePaths()
|
@@ -1987,7 +1987,12 @@ int cmake::AddCMakePaths()
|
||||||
cmStateEnums::INTERNAL);
|
cmStateEnums::INTERNAL);
|
||||||
#endif
|
#endif
|
||||||
if (!cmSystemTools::FileExists(
|
if (!cmSystemTools::FileExists(
|
||||||
@@ -39,7 +41,7 @@ index 3772f09985..c317e4af38 100644
|
|||||||
+ {
|
+ {
|
||||||
// couldn't find modules
|
// couldn't find modules
|
||||||
cmSystemTools::Error(
|
cmSystemTools::Error(
|
||||||
"Could not find CMAKE_ROOT !!!\n"
|
cmStrCat("Could not find CMAKE_ROOT !!!\n"
|
||||||
--
|
--
|
||||||
2.20.1
|
2.20.1
|
||||||
|
|
||||||
|
|||||||
@@ -75,10 +75,15 @@ config BR2_HOST_CMAKE_AT_LEAST_4_2
|
|||||||
bool
|
bool
|
||||||
select BR2_HOST_CMAKE_AT_LEAST_4_1
|
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
|
# This order guarantees that the highest version is set, as kconfig
|
||||||
# stops affecting a value on the first matching default.
|
# stops affecting a value on the first matching default.
|
||||||
config BR2_HOST_CMAKE_AT_LEAST
|
config BR2_HOST_CMAKE_AT_LEAST
|
||||||
string
|
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.2" if BR2_HOST_CMAKE_AT_LEAST_4_2
|
||||||
default "4.1" if BR2_HOST_CMAKE_AT_LEAST_4_1
|
default "4.1" if BR2_HOST_CMAKE_AT_LEAST_4_1
|
||||||
default "4.0" if BR2_HOST_CMAKE_AT_LEAST_4_0
|
default "4.0" if BR2_HOST_CMAKE_AT_LEAST_4_0
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# From https://cmake.org/files/v4.2/cmake-4.2.3-SHA-256.txt
|
# From https://cmake.org/files/v4.3/cmake-4.3.0-SHA-256.txt
|
||||||
sha256 7efaccde8c5a6b2968bad6ce0fe60e19b6e10701a12fce948c2bf79bac8a11e9 cmake-4.2.3.tar.gz
|
sha256 f51b3c729f85d8dde46a92c071d2826ea6afb77d850f46894125de7cc51baa77 cmake-4.3.0.tar.gz
|
||||||
|
|
||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 1e0d48f16c60f400838a96989684ae12cec35cb96688db11e8cb0204058cf4b8 LICENSE.rst
|
sha256 4382e7c1879ac90e3f101a395d23846fa4dbcaa1eed7265b43681e348754825d LICENSE.rst
|
||||||
|
|||||||
@@ -5,8 +5,8 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y
|
# When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y
|
||||||
CMAKE_VERSION_MAJOR = 4.2
|
CMAKE_VERSION_MAJOR = 4.3
|
||||||
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3
|
CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0
|
||||||
CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
|
CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
|
||||||
CMAKE_LICENSE = BSD-3-Clause
|
CMAKE_LICENSE = BSD-3-Clause
|
||||||
CMAKE_LICENSE_FILES = LICENSE.rst
|
CMAKE_LICENSE_FILES = LICENSE.rst
|
||||||
|
|||||||
Reference in New Issue
Block a user