From nobody Sun Apr 12 23:15:03 2026 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 4fv5wl6Sp2z6Z6L2 for ; Sun, 12 Apr 2026 23:15:03 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fv5wl2yFvz3NR7 for ; Sun, 12 Apr 2026 23:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776035703; 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=I6v5Ddo7O3yq1p+6n7Ypa8LJj2OPGHhpZ8pXYu0Y/wI=; b=lDgT2MRgjlKXnMBJpI71VMzLeYn/AXosz3xGmOol82jmh/UHnNePGu2ZEt/e9VSTtCvM7q FppFcDUvGP8+67Lt7ANDhtFtY1QmhlTPOCiszgIR6yCPzxaoYqQJwaitaAxfx/B+eH/vxw WO5vnJT2wL7Z9/Urue86oF/a4RwvxcAaKTn+Pu3TdC8hKK8ipd6Q5V66wbUxiqAaziXq/w f5/bmcGnTcqd3E2791sQBIrOqvTsJ0w0Fi7CoIbVgQPLADFc3uQ8elG8a7nCIqBpQT2FGD tyU60IvXhOBK4w5eEFX9Irvm96fl8sgdJ/+ns6GHw5GCYxBC9bOWEmOynCc4yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776035703; a=rsa-sha256; cv=none; b=Ptyko4EvvdHPmGx20GL/7YMSCLKFio6AGPY8P86QxrCOfwsQ07pFzWexSXvcrN55DeeYWO cMrTAW2oxBwY0ICxI2UIKE8onGZELBzVcmmGS7e7T0e5xzR4UjXFN403esV4yHeCnodMgz H5Rvh0bAh9d16oQrt1QPZlyr9CCHNcrpk+jmbJRjuZDq1f1SLIeJq2AEjuGH6W1aDRscj2 G1X/vjyXWTeaqEaFDsiLT5wVvDVJDy/T+e7pru0xLo4mpBX5jCE6QMgEFAFy4eSB3Xn9MN ploW1GJ6Gg/H5czcVegt6KnWY5oZMlvyzlIOY+fxPaqU+DezrxUUBXA0O4Y6JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776035703; 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=I6v5Ddo7O3yq1p+6n7Ypa8LJj2OPGHhpZ8pXYu0Y/wI=; b=ZQXUOjUfiA0I2hF7odX1kowhcrGZ5xqAkdmt2YuwC7d4NYqFY1ycsuhXRM3UULyQXVDcOx Cu1VLgRtkhcCjOPZIQsY8zaKWQqju0Pgmc+Sx8Qrsbqyv+tSVn3Av5QEq/NwyDfF8hgOk1 +bRi/slYe6h0cDGmu/KGZ7dkSb89X5NJgqBQqzHIiRlUgbnjhuvj5g8QdKlPApIqsu94/B BTrEahG0wVhusSYiyR+2ObdokY3b21ktsza8icWeUgtq3vRvhMyVAewW6Z7Vuh8IDwoJuF 95w0kXb71JKjpDcPJctg3F/oMF9qCTkpW+SsMoimTwdf2/1jQIT/py4bKcPPsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fv5wl23BPzfFv for ; Sun, 12 Apr 2026 23:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26864 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 23:15:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: a42f229f4c1e - stable/15 - flua: Always build as a bootstrap tool 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a42f229f4c1e28b91a6648ccc747de33733f819d Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 23:15:03 +0000 Message-Id: <69dc2777.26864.ef09e1@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=a42f229f4c1e28b91a6648ccc747de33733f819d commit a42f229f4c1e28b91a6648ccc747de33733f819d Author: Lexi Winter AuthorDate: 2026-04-07 10:41:53 +0000 Commit: Lexi Winter CommitDate: 2026-04-12 19:12:16 +0000 flua: Always build as a bootstrap tool We want to use flua from the source tree (not the host) during package build, firstly to protect us from breaking changes in lua or libucl, and secondly to allow (in future) cross-building of packages from Linux or macOS. Since we don't know if the user will be building packages during the bootstrap phase, and because flua is fairly small and generally useful, build it as a bootstrap tool unconditionally. MFC after: 2 weeks Reviewed by: kevans, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56270 (cherry picked from commit 50de0bf50512aa98d18f21ac1347941396596944) --- Makefile.inc1 | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d8890822d6ad..04aaf28ae19c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2610,17 +2610,11 @@ _bt_libkldelf_depend=${_bt}-lib/libkldelf _kldxref= usr.sbin/kldxref ${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend} ${_bt_libkldelf_depend} -# flua is required to regenerate syscall files. It first appeared during the -# 13.0-CURRENT cycle, thus needs to be built on -older releases and stable -# branches. -.if ${BOOTSTRAPPING} < 1300059 +# flua is required to regenerate syscall files, and for the pkgbase build. +# To protect us from changes in newer versions of flua or lua libraries +# that might be installed on the host, always bootstrap it. ${_bt}-libexec/flua: ${_bt}-lib/liblua -_flua= lib/liblua libexec/flua -.if ${BOOTSTRAPPING} == 0 -_flua+= lib/libmd lib/libucl lib/libyaml ${_bt}-libexec/flua: ${_bt}-lib/libmd ${_bt}-lib/libucl ${_bt}-lib/libyaml -.endif # BOOTSTRAPPING == 0 -.endif # r245440 mtree -N support added # r313404 requires sha384.h for libnetbsd, added to libmd in r292782 @@ -2906,7 +2900,11 @@ bootstrap-tools: ${_bt}-links .PHONY ${_elftoolchain_libs} \ ${_libkldelf} \ ${_kldxref} \ + lib/liblua \ + lib/libmd \ lib/libopenbsd \ + lib/libucl \ + lib/libyaml \ usr.bin/mandoc \ usr.bin/rpcgen \ ${_yacc} \ @@ -2916,7 +2914,7 @@ bootstrap-tools: ${_bt}-links .PHONY usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ - ${_flua} \ + libexec/flua \ ${_crunchide} \ ${_crunchgen} \ ${_etdump} \