From nobody Thu Jul 10 21:31:51 2025 X-Original-To: dev-commits-src-main@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 4bdSj43cWrz61ZpD; Thu, 10 Jul 2025 21:31:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdSj414cFz3Ks8; Thu, 10 Jul 2025 21:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752183112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Xc6RTjL1v62VVJHeS70gILQVY+7u3cRka71GmYdeHM=; b=en5l5wBecyfTjkVNonT6Wlyy1HprT/N4rl7h1JXtd/V2t3zpja7yc6Coxt/yYvCW4HVSvK zmYETh3xZ5k6WYEjIrvK08WwrFKxlIVYxPiN7yx/T9xxU+mK4wf+TQVHbsDrNllQMaeIGW i6mbK9Np55lY9yAJW3utGxttf6cZv+YToobd/AapT3MJ/CPS0pKRJh9VjZiozTzI7Ca0Ew upWQZ7kTFvrl6ytoRWS+9XW5GWUe9JDLygwdAhH/ZT6VyYztBggDLGT0McWzzsdjc/H8by JXYctfzk7K+udskKX8h4TIHwE+h/yukq+MFcWSI0Ttr+WV6zxRFOq1wesXuG6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752183112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Xc6RTjL1v62VVJHeS70gILQVY+7u3cRka71GmYdeHM=; b=EOQxlbW9fdAaRZEzwqg9d66+GyGIBIytV+4qjMCYGWhexO/QgxuCwsq1bNzazpf/+wsxJ6 Sb72kmkkecsj3K9c340zOn4uzwvAn0xR08EMvJt53wqDLqzLkjUSUgOGClWf39vzWv6imR XQiwvo6D/jcP2gqWP1+Y06ldBLtZpyffVWqi57dMFtDVNCNZN5T6JuELvquPqM8BeXzD07 dDamnX9zwYTS6eZYK1CMalSegDpyA9A8jBCiwW0SwmJhN5p18XxgTGKTcEM2QazuEwCSVc HclU3thk/6JgCOXq87b4IF7+vRl/aad0zcjNvg6jtvn7ZkxzhvR+EUiR5wMFGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752183112; a=rsa-sha256; cv=none; b=UmL6V8y1keOyou7qqBVgvGGNb4Y2gcIkb5J7p+T7aZr/JFK+Yrpel6eQBcmuW0VsqrtNFR e4iqTUJF4yuZiFW6S5UB+OCduzzWKBoE8BDrnc/LQFQovV6UNk0UdFLtcH35cyCir/LZuq XkRYAhJwOXvjvVT8TpQ/LuTudQn9kxOpoxCUOqQdQGypb6bTNJKryzfHCCVwDt8ezWy79l kN/sAvQZaoCBE6qkukWbBTQBILRDAtjRDxvwCRulZkzs0BxVWN8ZwARbV2wfdUVWiguMjr hSpJSMsmE8mBRohh2+oOPFg3JvvxI4PWlMbPTYC+05nL9ob2cBNoD/d7Nq1Xjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bdSj40frjz1NPb; Thu, 10 Jul 2025 21:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56ALVpuC082102; Thu, 10 Jul 2025 21:31:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56ALVpFl082099; Thu, 10 Jul 2025 21:31:51 GMT (envelope-from git) Date: Thu, 10 Jul 2025 21:31:51 GMT Message-Id: <202507102131.56ALVpFl082099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 09d28419c646 - main - cross-build: fix after the recent sqlite3 import List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09d28419c646650a77721e168ef43bc1bac96b67 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=09d28419c646650a77721e168ef43bc1bac96b67 commit 09d28419c646650a77721e168ef43bc1bac96b67 Author: Konstantin Belousov AuthorDate: 2025-07-10 21:02:37 +0000 Commit: Konstantin Belousov 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 . 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