Date: Sat, 5 Mar 2016 05:08:57 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296405 - head Message-ID: <201603050508.u2558voj071386@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat Mar 5 05:08:57 2016 New Revision: 296405 URL: https://svnweb.freebsd.org/changeset/base/296405 Log: 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 Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sat Mar 5 01:17:23 2016 (r296404) +++ head/Makefile.inc1 Sat Mar 5 05:08:57 2016 (r296405) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603050508.u2558voj071386>