Date: Thu, 25 Feb 2021 13:27:03 GMT From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 0af562d7e185 - main - bootstrap: add tic to the bootstrap tools Message-ID: <202102251327.11PDR3LC083820@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0af562d7e1850bbef230d30805c101b26588a3ed commit 0af562d7e1850bbef230d30805c101b26588a3ed Author: Baptiste Daroussin <bapt@FreeBSD.org> AuthorDate: 2021-02-23 06:21:52 +0000 Commit: Baptiste Daroussin <bapt@FreeBSD.org> CommitDate: 2021-02-25 13:25:28 +0000 bootstrap: add tic to the bootstrap tools tic is necessary early in the build to be able to build the terminfo database later on. Tested by: manu, jbeich --- Makefile.inc1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 005d9d25afb3..839d4d9db02b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2433,6 +2433,9 @@ ${_bt}-usr.sbin/config: ${_bt}-usr.bin/file2c ${_bt_lex_depend} # since "make" will usually point to GNU make there. _other_bootstrap_tools+=usr.bin/bmake +_other_bootstrap_tools+=lib/ncurses/ncurses +${_bt}-usr.bin/ncurses: ${_bt}-lib/ncurses/ncurses + # Avoid dependency on host bz2 headers: _other_bootstrap_tools+=lib/libbz2 ${_bt}-usr.bin/grep: ${_bt}-lib/libbz2 @@ -2479,6 +2482,7 @@ bootstrap-tools: ${_bt}-links .PHONY lib/libopenbsd \ usr.bin/mandoc \ usr.bin/rpcgen \ + lib/ncurses/ncurses \ ${_yacc} \ ${_m4} \ ${_lex} \ @@ -2493,6 +2497,7 @@ bootstrap-tools: ${_bt}-links .PHONY ${_nmtree} \ ${_vtfontcvt} \ ${_localedef} \ + usr.bin/ncurses \ ${LOCAL_BSTOOL_DIRS} ${_bt}-${_tool}: ${_bt}-links .PHONY .MAKE ${_+_}@${ECHODIR} "===> ${_tool} (obj,all,install)"; \ @@ -2514,6 +2519,9 @@ ${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd ${_bt}-sbin/md5: ${_bt}-lib/libmd .endif +if target(${_bt}-usr.bin/ncurses) +${_bt}-usr.bin/ncurses: ${_bt}-lib/ncurses/ncurses +.endif # # build-tools: Build special purpose build tools
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102251327.11PDR3LC083820>