From owner-dev-commits-src-main@freebsd.org Thu Feb 25 13:27:03 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D204E562E6A; Thu, 25 Feb 2021 13:27:03 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DmYVH5gVrz4jH9; Thu, 25 Feb 2021 13:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B5BA218611; Thu, 25 Feb 2021 13:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 11PDR3TN083821; Thu, 25 Feb 2021 13:27:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11PDR3LC083820; Thu, 25 Feb 2021 13:27:03 GMT (envelope-from git) Date: Thu, 25 Feb 2021 13:27:03 GMT Message-Id: <202102251327.11PDR3LC083820@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0af562d7e185 - main - bootstrap: add tic to the bootstrap tools MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0af562d7e1850bbef230d30805c101b26588a3ed Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2021 13:27:03 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0af562d7e1850bbef230d30805c101b26588a3ed commit 0af562d7e1850bbef230d30805c101b26588a3ed Author: Baptiste Daroussin AuthorDate: 2021-02-23 06:21:52 +0000 Commit: Baptiste Daroussin 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