From nobody Tue Apr 7 11:04:33 2026 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 4fqjyB29Bnz6Y2MZ for ; Tue, 07 Apr 2026 11:04:34 +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 4fqjy93t5Dz4Jty for ; Tue, 07 Apr 2026 11:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775559873; 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=xWf8rLga5Ceg2pUHdsaOqmRAY5qPi6Vs01K+YnHqa2g=; b=OasaH4n34LERnnkZsQ5svXLwXbN7aisxy++2zTjOz98RSZl+lluWgQR/RvQ5w3fRZmJDHA H7/bJJp4MnEm3G1iJs2b4ycn0MC8ahc/9pBhRBAusrxIKAUhqY1bwnQWi2WZQ/u05A5OJa RXBKjdr2+n3LLp5WdrO4tv8zfzlntA5fIuIppBKpg9zhzMA8boKQroRprvnhFGv+4QnEwi a+tZ6FI46gfA2R1FYTFP3j8QMk91kOFhPiW1I6N8jpXKFCakE8+FDkV/eLOcnx2xfy+Iqt fJFtuhNnhj4V71z1kT8yMgMC9cK2Xu2ljTP/0lL8+mNlitqXgqPtSJ7iPQOH6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775559873; a=rsa-sha256; cv=none; b=A9WAN1YoQYQfj6hitEyphgmkPoh4RoOuZwXqD6j8v0v7RGFPH66bawaXbQxpngeAIACWmO szbmiU6uT+8EfnisPVzkCX2LdjVOOstQuxhfOqwXutwEespa+WRWHn8cRmkkxJEzaApqci ebgAdM50Jq2k6iH1v9B65gPQVW/98y9Ay6wr38CXS2LpUMU9oDnxLUFxKj/n4EOQx/q2nO WKtGfpnGQYEfJD0dQJfVymQjmzvpGDViD4t5yF169o685+HXPck/6ChQArsLZb0u5+GPX1 0ahWxz5UlnTI9cI4tK8MigXghAf1k7tZMMekBPdPQ5/KbR4wjHyniBbVM+Kbzg== 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=1775559873; 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=xWf8rLga5Ceg2pUHdsaOqmRAY5qPi6Vs01K+YnHqa2g=; b=bSx27Hkp+xi2fZZ1vRZxGBbhbtjP84+WjO6XWWJ7pkyjqdViezsyUvCyy2btM5RMAYlXp8 S5qGS5B9Cxx0F5txHmYXb6ZucBDsSqqSSrSJfuT6+zF/HIxOlB5+CUqVY6/K/Ol/gNy/Y+ HxIEvu5C5ynuOhv8iViS5Aye2CRKATbOBWk6hfKCfGwPfHhJiGEI/qEapGQczU80Ma4oo/ wILUmuO6VbAtkJjtj9WKImxnBNEFwC0jv92Xk69U1mtU0o/VUaXj9014tZZBLuhJcg5+Fo XGAAHBWmAVbHtNV+4l9cPwocjiNL1UH9Ie0Vo8wTg/lkF0W7ORL1ce8pJ9251w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqjy93QTNzcj0 for ; Tue, 07 Apr 2026 11:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e7db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 11:04:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 50de0bf50512 - main - flua: Always build as a bootstrap tool 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50de0bf50512aa98d18f21ac1347941396596944 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 11:04:33 +0000 Message-Id: <69d4e4c1.1e7db.33fbe374@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=50de0bf50512aa98d18f21ac1347941396596944 commit 50de0bf50512aa98d18f21ac1347941396596944 Author: Lexi Winter AuthorDate: 2026-04-07 10:41:53 +0000 Commit: Lexi Winter CommitDate: 2026-04-07 10:41:53 +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 --- Makefile.inc1 | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 92e01389b4cd..a976daabbaef 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2614,17 +2614,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 @@ -2911,7 +2905,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} \ @@ -2921,7 +2919,7 @@ bootstrap-tools: ${_bt}-links .PHONY usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ - ${_flua} \ + libexec/flua \ ${_crunchide} \ ${_crunchgen} \ ${_etdump} \