From 0e58fb271c6e1cbd4b2ae5d33da181b7e7c2f0d5 Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Sat, 31 Oct 2026 13:13:06 -0700
Subject: [PATCH] atf, lutok, kyua: compile with CXXSTD=gnu++20

All three of the test infrastructure components require at least C++20
in order to build. Make that version the default to better match what
is required in recent versions of the projects.

MFC after:	1 week
---
 lib/atf/common.mk     | 2 ++
 lib/liblutok/Makefile | 2 ++
 usr.bin/kyua/Makefile | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/lib/atf/common.mk b/lib/atf/common.mk
index e1967097d2c1..4b0f9911eecd 100644
--- a/lib/atf/common.mk
+++ b/lib/atf/common.mk
@@ -16,3 +16,5 @@ atf-version-real: .PHONY
 	@grep 'define VERSION' ${ATF}/config.h \
 	    | cut -d '"' -f 2 >atf-version-real
 CLEANFILES+= atf-version atf-version-real
+
+CXXSTD=		gnu++20
diff --git a/lib/liblutok/Makefile b/lib/liblutok/Makefile
index 08737afbb61a..a145cf3dab52 100644
--- a/lib/liblutok/Makefile
+++ b/lib/liblutok/Makefile
@@ -18,4 +18,6 @@ CFLAGS+=	-I${SRCTOP}/contrib/lutok/include \
 WARNS?=	3
 SHLIB_MAJOR=	0
 
+CXXSTD=		gnu++20
+
 .include <bsd.lib.mk>
diff --git a/usr.bin/kyua/Makefile b/usr.bin/kyua/Makefile
index a761ebd8b974..137af9d68ab0 100644
--- a/usr.bin/kyua/Makefile
+++ b/usr.bin/kyua/Makefile
@@ -176,6 +176,8 @@ SRCS+=	os/freebsd/execenv_jail.cpp	\
 LIBADD+=	jail
 .endif
 
+CXXSTD=		gnu++20
+
 FILESGROUPS=	DOCS MISC STORE
 
 .if ${MK_EXAMPLES} != "no"