diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-03-05 05:08:57 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-03-05 05:08:57 +0000 |
| commit | 34f4acc8a896c4f836f0600df436f113ef61dd36 (patch) | |
| tree | d0d277bfb3498c8167d8305f2de62099bec51c78 | |
| parent | 09426b3d88287fe056029d7aad91ee2c7536e58a (diff) | |
| download | src-34f4acc8a896c4f836f0600df436f113ef61dd36.tar.gz src-34f4acc8a896c4f836f0600df436f113ef61dd36.zip | |
Conditionalize building makewhatis(1) for upgrades that need it.
Remove building of the legacy makewhatis(1) since it was only needed for
6.0 upgrades.
On my 2.2 GHz system libsqlite3 takes 60-100 seconds to build, which due to
its serialized nature can hold up the build waiting on it to finish in
bootstrap-tools.
makewhatis(1) was only required to be a build tool to support upgrades
from 6.0 which was properly removed in r208324 but later reverted due to
installworld using it. The installworld issue was fixed in r275622
when it was added to ITOOLS. A BOOTSTRAPPING check was missed when
makewhatis(1) was replaced with mandoc in r283777.
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=296405
| -rw-r--r-- | Makefile.inc1 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c8207944d8b2..55f9fe7dd48f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1529,13 +1529,12 @@ _kerberos5_bootstrap_tools= \ .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g} .endif -.if ${MK_MANDOCDB} != "no" +# r283777 makewhatis(1) replaced with mandoc version which builds a database. +.if ${MK_MANDOCDB} != "no" && ${BOOTSTRAPPING} < 1100075 _libopenbsd?= lib/libopenbsd _makewhatis= lib/libsqlite3 \ usr.bin/mandoc ${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd ${_bt}-lib/libsqlite3 -.else -_makewhatis=usr.bin/makewhatis .endif bootstrap-tools: .PHONY |