diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2026-04-23 02:56:05 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2026-04-23 02:56:05 +0000 |
| commit | 1f41f56991a1a8cc836fa41fa7bb59150b46e8d5 (patch) | |
| tree | eb430de2b0e856e777b0c1f083715ebb2e6e41c2 | |
| parent | 06a51a510a60ca29193b2cdb8120b630ea9ef18c (diff) | |
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
| -rw-r--r-- | Makefile.inc1 | 16 |
1 files 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 |