diff mbox series

[1/1] package/cmake: bump version to 3.31.1

Message ID 20241211192758.1653472-1-bernd@kuhls.net
State Accepted
Headers show
Series [1/1] package/cmake: bump version to 3.31.1 | expand

Commit Message

Bernd Kuhls Dec. 11, 2024, 7:27 p.m. UTC
Release notes:
https://cmake.org/cmake/help/v3.31/release/3.31.html

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/cmake/Config.in.host | 5 +++++
 package/cmake/cmake.hash     | 4 ++--
 package/cmake/cmake.mk       | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

Comments

Julien Olivain Dec. 13, 2024, 8:51 p.m. UTC | #1
On 11/12/2024 20:27, Bernd Kuhls wrote:
> Release notes:
> https://cmake.org/cmake/help/v3.31/release/3.31.html
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Applied to master, thanks.

> ---
>  package/cmake/Config.in.host | 5 +++++
>  package/cmake/cmake.hash     | 4 ++--
>  package/cmake/cmake.mk       | 4 ++--
>  3 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/package/cmake/Config.in.host 
> b/package/cmake/Config.in.host
> index 389300f31f..b30ce03a1c 100644
> --- a/package/cmake/Config.in.host
> +++ b/package/cmake/Config.in.host
> @@ -59,10 +59,15 @@ config BR2_HOST_CMAKE_AT_LEAST_3_30
>  	bool
>  	select BR2_HOST_CMAKE_AT_LEAST_3_29
> 
> +config BR2_HOST_CMAKE_AT_LEAST_3_31
> +	bool
> +	select BR2_HOST_CMAKE_AT_LEAST_3_30
> +
>  # 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 "3.31"	if BR2_HOST_CMAKE_AT_LEAST_3_31
>  	default "3.30"	if BR2_HOST_CMAKE_AT_LEAST_3_30
>  	default "3.29"	if BR2_HOST_CMAKE_AT_LEAST_3_29
>  	default "3.28"	if BR2_HOST_CMAKE_AT_LEAST_3_28
> diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash
> index f80b942103..f214c21925 100644
> --- a/package/cmake/cmake.hash
> +++ b/package/cmake/cmake.hash
> @@ -1,5 +1,5 @@
> -# From https://cmake.org/files/v3.30/cmake-3.30.5-SHA-256.txt
> -sha256  
> 9f55e1a40508f2f29b7e065fa08c29f82c402fa0402da839fffe64a25755a86d  
> cmake-3.30.5.tar.gz
> +# From https://cmake.org/files/v3.31/cmake-3.31.1-SHA-256.txt
> +sha256  
> c4fc2a9bd0cd5f899ccb2fb81ec422e175090bc0de5d90e906dd453b53065719  
> cmake-3.31.1.tar.gz
> 
>  # Locally calculated
>  sha256  
> 0676e30827684487aa0ea8f72f01e9460a6320fa34a2888df0ad1dd3e8a06eb8  
> Copyright.txt
> diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
> index 0c5d46c23d..7fc1f0181d 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 = 3.30
> -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).5
> +CMAKE_VERSION_MAJOR = 3.31
> +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1
>  CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
>  CMAKE_LICENSE = BSD-3-Clause
>  CMAKE_LICENSE_FILES = Copyright.txt
> --
> 2.39.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/package/cmake/Config.in.host b/package/cmake/Config.in.host
index 389300f31f..b30ce03a1c 100644
--- a/package/cmake/Config.in.host
+++ b/package/cmake/Config.in.host
@@ -59,10 +59,15 @@  config BR2_HOST_CMAKE_AT_LEAST_3_30
 	bool
 	select BR2_HOST_CMAKE_AT_LEAST_3_29
 
+config BR2_HOST_CMAKE_AT_LEAST_3_31
+	bool
+	select BR2_HOST_CMAKE_AT_LEAST_3_30
+
 # 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 "3.31"	if BR2_HOST_CMAKE_AT_LEAST_3_31
 	default "3.30"	if BR2_HOST_CMAKE_AT_LEAST_3_30
 	default "3.29"	if BR2_HOST_CMAKE_AT_LEAST_3_29
 	default "3.28"	if BR2_HOST_CMAKE_AT_LEAST_3_28
diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash
index f80b942103..f214c21925 100644
--- a/package/cmake/cmake.hash
+++ b/package/cmake/cmake.hash
@@ -1,5 +1,5 @@ 
-# From https://cmake.org/files/v3.30/cmake-3.30.5-SHA-256.txt
-sha256  9f55e1a40508f2f29b7e065fa08c29f82c402fa0402da839fffe64a25755a86d  cmake-3.30.5.tar.gz
+# From https://cmake.org/files/v3.31/cmake-3.31.1-SHA-256.txt
+sha256  c4fc2a9bd0cd5f899ccb2fb81ec422e175090bc0de5d90e906dd453b53065719  cmake-3.31.1.tar.gz
 
 # Locally calculated
 sha256  0676e30827684487aa0ea8f72f01e9460a6320fa34a2888df0ad1dd3e8a06eb8  Copyright.txt
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index 0c5d46c23d..7fc1f0181d 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 = 3.30
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).5
+CMAKE_VERSION_MAJOR = 3.31
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).1
 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3-Clause
 CMAKE_LICENSE_FILES = Copyright.txt