Build selective portions of gnu/usr.bin/texinfo as part of build-tools to
ensure that building on a host without makeinfo (i.e. a host where make delete-old -DWITHOUT_INFO was run), then building with MK_INFO == yes doesn't manifest in build errors when building info pages This manifested itself like the following when I was build testing an MFC change on stable/10: makeinfo --no-split -I /usr/src/gnu/lib/libregex/doc -I /usr/src/gnu/lib/libregex/doc regex.texi -o regex.info makeinfo: not found *** [regex.info] Error code 127 make[6]: stopped in /usr/src/gnu/lib/libregex/doc 1 error Tested on a head VM without makeinfo installed and by building with MK_INFO=yes MFC after: 1 week
This commit is contained in:
parent
a0041e6d2f
commit
492c2b1f49
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=276052
@ -1367,6 +1367,11 @@ _share= share/syscons/scrnmaps
|
||||
_gcc_tools= gnu/usr.bin/cc/cc_tools
|
||||
.endif
|
||||
|
||||
.if ${MK_INFO} != "no"
|
||||
_texinfo= gnu/usr.bin/texinfo/libtxi \
|
||||
gnu/usr.bin/texinfo/makeinfo
|
||||
.endif
|
||||
|
||||
.if ${MK_RESCUE} != "no"
|
||||
_rescue= rescue/rescue
|
||||
.endif
|
||||
@ -1398,6 +1403,16 @@ build-tools: .MAKE
|
||||
${MAKE} DIRPRFX=${_tool}/ depend && \
|
||||
${MAKE} DIRPRFX=${_tool}/ all
|
||||
.endfor
|
||||
.for _tool in \
|
||||
${_texinfo}
|
||||
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
|
||||
cd ${.CURDIR}/${_tool} && \
|
||||
${MAKE} DIRPRFX=${_tool}/ obj && \
|
||||
${MAKE} DIRPRFX=${_tool}/ depend && \
|
||||
${MAKE} DIRPRFX=${_tool}/ all && \
|
||||
${MAKE} DIRPRFX=${_tool}/ install DESTDIR=${WORLDTMP}
|
||||
.endfor
|
||||
|
||||
|
||||
#
|
||||
# kernel-tools: Build kernel-building tools
|
||||
|
Loading…
Reference in New Issue
Block a user