Date: Mon, 15 Dec 2025 17:00:41 +0000 From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov <kib@FreeBSD.org> Subject: git: 52a61478e558 - stable/14 - cross-build: fix after the recent sqlite3 import Message-ID: <69403eb9.df9c.4639c275@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=52a61478e5589be242a3b4a889da71ce533c8daf commit 52a61478e5589be242a3b4a889da71ce533c8daf Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2025-07-10 21:02:37 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2025-12-15 16:58:46 +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") (cherry picked from commit 09d28419c646650a77721e168ef43bc1bac96b67) --- 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 d1cb2a51f667..8e2c0010fb59 100644 --- a/usr.bin/kyua/Makefile +++ b/usr.bin/kyua/Makefile @@ -33,7 +33,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 # kyua uses auto_ptr CFLAGS+= -Wno-deprecated-declarations CXXSTD= c++11help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69403eb9.df9c.4639c275>