From nobody Thu Apr 23 02:56:31 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 4g1LMg4ZMbz6bPV1 for ; Thu, 23 Apr 2026 02:56:31 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1LMg3fVqz3xhV for ; Thu, 23 Apr 2026 02:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776912991; 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=/DQC92NTvMO43xW+tNGYhjkxVHvD+QD2sQQnA5xhLNg=; b=KLk+NFAkc0OS9nuaqifFZB0RpB5zxd7o5wnJ18VVCzPbT+/opXh7ZVGmGF3AEceEs7+l9q HWhFRwJMhCevQ7T5lKMjKHv0BjFjwG0y97+0kgs1uO2PdRJSYC/SxH5XTtUOiDwO8BNfzN Mu2gCnywAXhEjdHqswjfMGTLxCcbdb8ote/AT5ncQv+rNf26K/U0I0aBQaY8o/zeLrQkLL 2keylTY0e+xPQrhQASdIebOqfWTDWZGvRj/No9g5YCEgAJunemSgA5LWU3KqcXKSJDeCnQ VT6mP9XSfD1vQawAbo/z53xirOepuXmYdBP7dP8PtIYP9lZHOz2lvBuJ+Gl4Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776912991; a=rsa-sha256; cv=none; b=U2Ag9Ep073qmwXyfbG33IVnjq1HOMY3HML+H1rd7hZFrH+EqQckYip6BMXYS1h8L92cNc/ eS13nIPNzEmh5AIoDjVpUDOWsOP0DWd4/QIlg6FjV9W2oDHn5lk8o2c82TPsaN2AfET1i/ ICUcfgIa5OsPFz7/ZcMhIkxDrGxySeVv8mSYwDj/OXiLwlZPGMaXlKOmLPItEtx7lFM0hm 1U7PbXcfkXM9DbDFotASMdd/g/zv9dAc1569jDwK9rpOH73TvVDNwWeIUxe5vsO5wvy2Xu eg9lbOGiTC1G0RvP2f5EjlPS9lfpP1T6hsSRZQO/LsrgF1Q+zOY8TjOW6yfReg== 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=1776912991; 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=/DQC92NTvMO43xW+tNGYhjkxVHvD+QD2sQQnA5xhLNg=; b=L8k4xZ5jB6483w0GFMtE/z5kSBl8hOBmbKYLEi0/9eYXhR0O7nnhY36Q1DpiU/9Jn9e/Ca paIJgIll10FMYp/BD3xHOCchfI78kg3Mja5cHpAlSWzusqyFw0vEYYYmsY3KgMhO6H/62s BmJtfev4Ssu4Uw3ki4Rh1tvjlW5mgjoHUbKpGDra1czh4OhuiHjN5JA00DLU7/xboVTB9Z 1dU2gbe0lOyW8gt++EmBM1cetm+dSYMiUhXBe/yag8DBZonZrQBnyjN05IgoZHfYcC3x5a ucn0+tpgxtLPoMpVy9Lz9Nw1wpOW26XdgipxUXo+j6bMW9HhhIUC/j1rVpKpsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1LMg392tzydl for ; Thu, 23 Apr 2026 02:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36282 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Apr 2026 02:56:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 1f41f56991a1 - main - makeman: switch over to the .lua implementation 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f41f56991a1a8cc836fa41fa7bb59150b46e8d5 Auto-Submitted: auto-generated Date: Thu, 23 Apr 2026 02:56:31 +0000 Message-Id: <69e98a5f.36282.4f358d80@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1f41f56991a1a8cc836fa41fa7bb59150b46e8d5 commit 1f41f56991a1a8cc836fa41fa7bb59150b46e8d5 Author: Kyle Evans AuthorDate: 2026-04-23 02:56:05 +0000 Commit: Kyle Evans CommitDate: 2026-04-23 02:56:05 +0000 makeman: switch over to the .lua implementation Nobody will test it as long as it's not tied into the top-level target, and we don't really have a good reason not to cut over to it since it does produce identical results. Switch over but do not remove the old sh implementation yet, just in case. Note that this replacement is driven by a significant speedup from how the new version is designed: tha lua version actually tries to parallelize its data collection efforts to speed up generation. Reviewed by: imp (previous version), emaste Differential Revision: https://reviews.freebsd.org/D56558 --- Makefile.inc1 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 681ebb44fc52..8d4dd3570a7b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1573,8 +1573,15 @@ packageworld: .PHONY ${XZ_CMD} > ${PACKAGEDIR}/${dist}-dbg.txz .endfor +# We can't assume here that ${TMPPATH} will include ${PATH} or /usr/libexec +# because we may be building with a STRICTTMPPATH, so we explicitly include +# /usr/libexec here for flua. ${TMPPATH} still usefully includes anything else +# we may need to function. +_flua_PATH= ${TMPPATH}:/usr/libexec + makeman: .PHONY - ${_+_}cd ${.CURDIR}/tools/build/options; sh makeman > \ + ${_+_}@cd ${.CURDIR}/tools/build/options; \ + PATH=${_flua_PATH:Q} flua makeman.lua > \ ${.CURDIR}/share/man/man5/src.conf.5 # Ensure no regressions in self-includeability of sys/*.h and net*/*.h @@ -1583,11 +1590,6 @@ test-includes: .PHONY ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} obj; \ ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} DESTDIR=${WORLDTMP} test-includes -# We can't assume here that ${TMPPATH} will include ${PATH} or /usr/libexec -# because we may be building with a STRICTTMPPATH, so we explicitly include -# /usr/libexec here for flua. ${TMPPATH} still usefully includes anything else -# we may need to function. -_sysent_PATH= ${TMPPATH}:/usr/libexec _sysent_dirs= sys/kern _sysent_dirs+= sys/compat/freebsd32 _sysent_dirs+= sys/amd64/linux \ @@ -1600,7 +1602,7 @@ sysent: .PHONY .for _dir in ${_sysent_dirs} sysent-${_dir}: .PHONY @echo "${MAKE} -C ${.CURDIR}/${_dir} sysent" - ${_+_}@env PATH=${_sysent_PATH:Q} ${MAKE} -C ${.CURDIR}/${_dir} sysent + ${_+_}@env PATH=${_flua_PATH:Q} ${MAKE} -C ${.CURDIR}/${_dir} sysent sysent: sysent-${_dir} .endfor