The branch main has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=09d28419c646650a77721e168ef43bc1bac96b67
commit 09d28419c646650a77721e168ef43bc1bac96b67
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2025-07-10 21:02:37 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2025-07-10 21:31:23 +0000
cross-build: fix after the recent sqlite3 import
Stop adding contrib/sqlite3 into the include path for usr.bin/kyua, take
headers from the install sysroot env. sqilte3 now has the VERSION file,
which clashes with c++ include <version>.
Submitted by: jrtc27 (see https://reviews.freebsd.org/D51217)
Tested by: kib
Fixes: 17f0f75308f2 ("sqlite3: Vendor import of sqlite3 3.50.2")
---
usr.bin/kyua/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.bin/kyua/Makefile b/usr.bin/kyua/Makefile
index d3a7b9b61f64..a4f95f1106d9 100644
--- a/usr.bin/kyua/Makefile
+++ b/usr.bin/kyua/Makefile
@@ -32,7 +32,7 @@ MAN= kyua-about.1 \
CFLAGS+= -I${KYUA_SRCDIR} -I${.CURDIR}
CFLAGS+= -I${SRCTOP}/contrib/lutok/include
-CFLAGS+= -I${SRCTOP}/contrib/sqlite3
+CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/private/sqlite3
CFLAGS+= -DHAVE_CONFIG_H
# We compile the kyua libraries as part of the main executable as this saves
