From nobody Mon Dec 15 17:00:41 2025 X-Original-To: dev-commits-src-all@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 4dVRCG1ShDz6L1pw for ; Mon, 15 Dec 2025 17:00:42 +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 4dVRCF6xjDz3qFN for ; Mon, 15 Dec 2025 17:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818042; 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=qzNMhWTxuliT1ZdTE9qXY8nI1KM6beHU8OVtUE4eLhg=; b=XyJb93uhiqub4UuCzJqNQViu04UD5iSXwmiboEjtTjzBLP99b/pSGaQ+JxXfhSg2uOMEnM /9hAFcggbTGQHduWTtY7NUQtFUqfWJp1guYaKkUI1MiAwn1s1B9dvdlzAcKg4wcJ0KN/kG MmTX3C8Re4A77dh0kVM2B9ErZ7cIuxY64+DMu9T2kmsTxNpFxFq72F53ALcSwmkpqGD0sB T5ET63bgW2JI326/5v79XIeLkWWkKKBkw+6doierDhnpxnRadGoQxyNH84l5fFxd2Z9ESM AlB70eU997ITG4nMUmGa4HJ6VGSPxvtVL0TnA16rwL27NkjEkGJ0gcZd6MLF2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765818042; 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=qzNMhWTxuliT1ZdTE9qXY8nI1KM6beHU8OVtUE4eLhg=; b=mHRxSYZdkHMzyqB1Ku6kgQVqkLoadxxZqQWyM3M5chW8RodUpB8jeNIGDz13V1l7jj5GDG 8CeoZQ1WJUiteD6ndidXP3b9FVsdPdCdhGlxP/qM6JwffOmEr4+kZBVVOVkhnItwkP1llV uCH2gTshDqN3XhyzlK5UljCuUcwIysQst6Qn8bUwusI2KnhG3l1ulHCzYOFNljjByzvqau utv7YXDqlztDpU2D0NpzzyJ5CSG3xYtJpPyxBiYJYrLYhPVuXrnqBFEfizihLAiJpKO9oB F5+k+Y7b7Olmmy8RC0ImF9cZ5cExtqF/ixdHcpEspzd60Rw2ld0ktUrbgtKo4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765818042; a=rsa-sha256; cv=none; b=kcnsQBVGrkla/9LrmJBKknCr7eCwxSdHK24QngzKnlLMI2hMBSLIvjWJaX66jMJin+j5P9 iN1P2UwTAy7Z8mBFmkBMm+SBIlGfiQUwMj/YPYk0JCwnGaPKs5ke5UZM2pkYujS+g/Cmuw iGHFtNJsiBz2/g01gdpxKnH4Fn2tMOE3wcxWxfQ1mIivfKRCTlL9rUrjJ3STGJ8+2DPf/9 fbJm0Uj1HQ9aKi3q6kOni2/E2ah8IUCey+d+8qYwQkwrhFmePiNjWMBCkYQEE8HL4wTgUV Yl0HAvqd7Q/2wRUniC24f6zF5tlgpPYVjVSkmtbnGqq8sEL+D+prLzqB13dykw== 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 4dVRCF6YNjzCx1 for ; Mon, 15 Dec 2025 17:00:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id df9c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 17:00:41 +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: 52a61478e558 - stable/14 - cross-build: fix after the recent sqlite3 import List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 52a61478e5589be242a3b4a889da71ce533c8daf Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 17:00:41 +0000 Message-Id: <69403eb9.df9c.4639c275@gitrepo.freebsd.org> The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=52a61478e5589be242a3b4a889da71ce533c8daf commit 52a61478e5589be242a3b4a889da71ce533c8daf Author: Konstantin Belousov AuthorDate: 2025-07-10 21:02:37 +0000 Commit: Jessica Clarke 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 . 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++11