[Buildroot] [PATCH 1/1] package/atf: bump to version 0.25

[Dario Binacchi <dario.binacchi@amarulasolutions.com>]

The removed patch has been merged [1].

Since version 0.24, a C++20 compiler is required [2], so add a
dependency on gcc >= 10 and propagate it to kyua, which selects atf.

Release notes:
https://github.com/freebsd/atf/releases/tag/atf-0.25

[1] https://github.com/freebsd/atf/commit/67e7d350a15aff88c151b1fc838dac83d35be955
[2] https://github.com/freebsd/atf/commit/35134a317cdb486b4e7c0cdff20d1084d06159de
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .../0001-atf-check.cpp-include-time.h.patch   | 33 -------------------
 package/atf/Config.in                         |  5 +--
 package/atf/atf.hash                          |  2 +-
 package/atf/atf.mk                            |  2 +-
 package/kyua/Config.in                        |  6 ++--
 5 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 package/atf/0001-atf-check.cpp-include-time.h.patch

diff --git a/package/atf/0001-atf-check.cpp-include-time.h.patch b/package/atf/0001-atf-check.cpp-include-time.h.patch
deleted file mode 100644
index 359172c0e6f7..000000000000
--- a/package/atf/0001-atf-check.cpp-include-time.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 67e7d350a15aff88c151b1fc838dac83d35be955 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd@kuhls.net>
-Date: Sat, 22 Nov 2025 23:47:41 +0100
-Subject: [PATCH] atf-check.cpp: include time.h
-
-Fixes build error with gcc 14 as reported by the buildroot autobuilders:
-https://autobuild.buildroot.net/results/41b/41b25ee8e66e34323eca011e4b5fe479ece9ed76/build-end.log
-
-atf-sh/atf-check.cpp: In function 'useconds_t get_monotonic_useconds()':
-atf-sh/atf-check.cpp:183:24: error: 'CLOCK_MONOTONIC' was not declared in this scope
-
-Upstream: https://github.com/freebsd/atf/commit/67e7d350a15aff88c151b1fc838dac83d35be955
-
-Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
----
- atf-sh/atf-check.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/atf-sh/atf-check.cpp b/atf-sh/atf-check.cpp
-index 1354e3a..94da413 100644
---- a/atf-sh/atf-check.cpp
-+++ b/atf-sh/atf-check.cpp
-@@ -30,6 +30,7 @@ extern "C" {
- #include <limits.h>
- #include <signal.h>
- #include <stdint.h>
-+#include <time.h>
- #include <unistd.h>
- }
- 
--- 
-2.47.3
-
diff --git a/package/atf/Config.in b/package/atf/Config.in
index 800b488945f0..91e7364000a5 100644
--- a/package/atf/Config.in
+++ b/package/atf/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_ATF
 	bool "atf"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20
 	depends on BR2_USE_MMU # fork()
 	help
 	  ATF, or Automated Testing Framework, is a collection of
@@ -8,6 +9,6 @@ config BR2_PACKAGE_ATF
 
 	  https://github.com/freebsd/atf
 
-comment "atf needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "atf needs a toolchain w/ C++, gcc >= 10"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_10
 	depends on BR2_USE_MMU
diff --git a/package/atf/atf.hash b/package/atf/atf.hash
index 6cd2323ab078..f979b8b0521c 100644
--- a/package/atf/atf.hash
+++ b/package/atf/atf.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  a64e2427d021297f25b3f2e1798f8ec4dc3061ffb01a1cd3f66cc4cee486b10f  atf-0.23.tar.gz
+sha256  a52be96b5565733e71df8d0ecc8a4255a495e45183de7e3657491e0a8069423f  atf-0.25.tar.gz
 sha256  2a15172ddf6386297734c9800c899e6e8dc16c5a03931dcf95a9ab321a24cfe4  COPYING
diff --git a/package/atf/atf.mk b/package/atf/atf.mk
index 91d2fb556762..a49d32692da6 100644
--- a/package/atf/atf.mk
+++ b/package/atf/atf.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ATF_VERSION = 0.23
+ATF_VERSION = 0.25
 ATF_SITE = https://github.com/freebsd/atf/releases/download/atf-$(ATF_VERSION)
 ATF_INSTALL_STAGING = YES
 ATF_LICENSE = BSD-2-Clause, BSD-3-Clause
diff --git a/package/kyua/Config.in b/package/kyua/Config.in
index 4fc5e098adc3..925c42ed6567 100644
--- a/package/kyua/Config.in
+++ b/package/kyua/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_KYUA
 	bool "kyua"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # atf
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER # lutok
 	depends on !BR2_PACKAGE_LUAJIT # lutok
 	depends on !BR2_STATIC_LIBS # lutok
@@ -17,7 +18,8 @@ config BR2_PACKAGE_KYUA
 
 	  https://github.com/jmmv/kyua
 
-comment "kyua needs a toolchain w/ C++, dynamic library and full Lua"
-	depends on !BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_LUAJIT || BR2_STATIC_LIBS
+comment "kyua needs a toolchain w/ C++, dynamic library, full Lua, gcc >= 10"
+	depends on !BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_LUAJIT || \
+		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_10
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	depends on BR2_USE_MMU
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot