From nobody Mon Dec 15 18:19:09 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dVSxn4ft2z6L7VW for ; Mon, 15 Dec 2025 18:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVSxn2v2Qz4Lyn for ; Mon, 15 Dec 2025 18:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ivaypY0XN98UQOd10TBd2kGJluUMXTG5Hgfx58F5lsk=; b=xY1IZHT+hSQsbwYJP+9sVqKXzkvTNaPWeZwXAoWBMDGzm5yZlYlf+a45QjzBPYe1E6VWVS TFjKheD6Gkhl/djb8bHq3t3fmwRg9TOOZCxmITbBKWGksK7g2+oX5NnS/U40TBsqZrXixn I5DKbJWxkAYWj+83Lje1mi0koi6jD9YGPAhUIeBAZISkpGmInVozguUuUaKmaiUdRJYWD1 xijrdmV4WfwBhLg1imXAwuQm7FJM3eFApz+y2X/L7V8tsjjzp2f7pe8OHruYP+zizGChpa luP3ylddiTNXykC2JoY/5uXZZ6vZuop8fChAVz0FDiR5xtgveJtTyo18eomb0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765822749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ivaypY0XN98UQOd10TBd2kGJluUMXTG5Hgfx58F5lsk=; b=ZDFUeLIFhCsAocK9Gg20lfnkxIWQr+AEy8J2QeXnnusutOo0xJ6su+Y/5ACrJbGbN5nJEv 7aDjlFlvmZc2ZI4P/XQcNyZnes+IAEmHn1EsAaWuB1xPtzQGjKN70h86Sh4pNAxWxqsADX bcCyRBYHuHeMP6X7r8f5g2iIm9RpyN44gCcE8rsUkZKvo9GTjTvPsAk8+Y2Cqm4NmgDCN1 yD8zYjOUSG2/IfR7YH58FKSiU3qNnpllE/J8prTV+uVa8VpfffqSoSI3hLLLcnXoUuenx8 RyJ2RowIM1MULHE5ylFjmPIaUusNWWoZ43or6O3ltIlnmr4I+97Ibb7NZxQyFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765822749; a=rsa-sha256; cv=none; b=uPsAz+G1emuJXmJSfZ49vFVx8275YvbrZNY9ejo2cMeB9/Oucx09J/O4WfzZRn7muWKNy6 CJTpMAIMR9IClWkFcH0zzAl2qknJSZytZ16Kwz7CbPjDuR8XUBv5ZBQJD3fYGL5r6pzwUX NvxunIFc/d1Iw/R+Iz5U4LWUkqXv3dOPKtl7omD0FW+vszsKP72X44orOhlmMpZNGTqVF2 0cTo+DDM3U8PFst6+ATKf/SI/1j7Bxemywo2MyyxsE0OCfKYHBrzfS6mqhbz05K/ciR3f+ /NlCWNecpD/sZNLpPKr14mkniygpARFTazGD93V/nNH52/cS+EkjJQtey88Adg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVSxn2QtPzWdy for ; Mon, 15 Dec 2025 18:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25bbc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 18:19:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Jessica Clarke Subject: git: 056563a1580f - stable/13 - cross-build: fix after the recent sqlite3 import List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 056563a1580f9614d7eba4c7e2855787f4d50664 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 18:19:09 +0000 Message-Id: <6940511d.25bbc.1aa73cd8@gitrepo.freebsd.org> The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=056563a1580f9614d7eba4c7e2855787f4d50664 commit 056563a1580f9614d7eba4c7e2855787f4d50664 Author: Konstantin Belousov AuthorDate: 2025-07-10 21:02:37 +0000 Commit: Jessica Clarke CommitDate: 2025-12-15 17:56:37 +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 . 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 953bb46589b1..50b683e51586 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++11