From owner-svn-src-all@freebsd.org Sat Nov 14 04:50:30 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15EC6A2D6E8; Sat, 14 Nov 2015 04:50:30 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BF6D41EF1; Sat, 14 Nov 2015 04:50:29 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAE4oSQ0067480; Sat, 14 Nov 2015 04:50:28 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAE4oSJt067478; Sat, 14 Nov 2015 04:50:28 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201511140450.tAE4oSJt067478@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sat, 14 Nov 2015 04:50:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290817 - in head: share/man/man5 tools/build/options X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Nov 2015 04:50:30 -0000 Author: sjg Date: Sat Nov 14 04:50:28 2015 New Revision: 290817 URL: https://svnweb.freebsd.org/changeset/base/290817 Log: Regen src.conf.5 Modified: head/share/man/man5/src.conf.5 head/tools/build/options/makeman Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Sat Nov 14 03:24:48 2015 (r290816) +++ head/share/man/man5/src.conf.5 Sat Nov 14 04:50:28 2015 (r290817) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 290435 2015-11-06 05:28:08Z bdrewery .\" $FreeBSD$ -.Dd November 7, 2015 +.Dd November 13, 2015 .Dt SRC.CONF 5 .Os .Sh NAME @@ -73,6 +73,7 @@ variable, which defaults to .Pa /etc/src-env.conf . Some examples that may only be set in this file are .Va MAKEOBJDIRPREFIX , +.Va WITH_DIRDEPS_BUILD , and .Va WITH_META_MODE as they are environment-only variables. @@ -462,12 +463,86 @@ and are located automatically by .It Va WITHOUT_DICT .\" from FreeBSD: head/tools/build/options/WITHOUT_DICT 156932 2006-03-21 07:50:50Z ru Set to not build the Webster dictionary files. +.It Va WITH_DIRDEPS_BUILD +.\" from FreeBSD: head/tools/build/options/WITH_DIRDEPS_BUILD 290816 2015-11-14 03:24:48Z sjg +Enable building in meta mode. +This is an experimental build feature. +For details see +http://www.crufty.net/sjg/docs/freebsd-meta-mode.htm. +.Pp +The build is driven by dirdeps.mk using +.Va DIRDEPS +stored in +Makefile.depend files found in each directory. +.Pp +The build can be started from anywhere, and behaves the same. +The initial instance of +.Xr make 1 +recursively reads +.Va DIRDEPS +from Makefile.depend +computing a graph of tree dependencies from the current origin. +Setting +.Va NO_DIRDEPS +will skip checking dirdep dependencies and will only build in the current +directory. +.Pp +As each target is made +.Xr make 1 +produces a meta file which is used to capture (and compare) +the command line, +as well as any command output. +If +.Xr filemon 4 +is available the meta file will also capture a record of files +used to produce the target by tracking syscalls. +.Pp +The build will hide commands ran unless +.Va NO_SILENT +is defined. +.Pp +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITH_INSTALL_AS_USER +.El +.Pp +When set, the following options are also in effect: +.Pp +.Bl -inset -compact +.It Va WITH_AUTO_OBJ +(unless +.Va WITHOUT_AUTO_OBJ +is set explicitly) +.It Va WITH_STAGING +(unless +.Va WITHOUT_STAGING +is set explicitly) +.It Va WITH_STAGING_MAN +(unless +.Va WITHOUT_STAGING_MAN +is set explicitly) +.It Va WITH_STAGING_PROG +(unless +.Va WITHOUT_STAGING_PROG +is set explicitly) +.It Va WITH_SYSROOT +(unless +.Va WITHOUT_SYSROOT +is set explicitly) +.El +.Pp +This must be set in the environment, make command line, or +.Pa /etc/src-env.conf , +not +.Pa /etc/src.conf . .It Va WITH_DIRDEPS_CACHE -.\" from FreeBSD: head/tools/build/options/WITH_DIRDEPS_CACHE 284708 2015-06-22 20:21:57Z sjg +.\" from FreeBSD: head/tools/build/options/WITH_DIRDEPS_CACHE 290816 2015-11-14 03:24:48Z sjg Cache result of dirdeps.mk which can save significant time for subsequent builds. Depends on -.Va WITH_META_MODE . +.Va WITH_DIRDEPS_BUILD . .Pp This must be set in the environment, make command line, or .Pa /etc/src-env.conf , @@ -950,84 +1025,10 @@ Set to not build utilities for manual pa .Xr whatis 1 , .Xr manctl 8 , and related support files. -.It Va WITH_META_FILES -.\" from FreeBSD: head/tools/build/options/WITH_META_FILES 284708 2015-06-22 20:21:57Z sjg -Create meta files during non META_MODE build. -The meta files can be useful for debugging. -.Pp -This must be set in the environment, make command line, or -.Pa /etc/src-env.conf , -not -.Pa /etc/src.conf . .It Va WITH_META_MODE -.\" from FreeBSD: head/tools/build/options/WITH_META_MODE 287973 2015-09-18 22:22:32Z bdrewery -Enable building in meta mode. -This is an experimental build feature. -For details see -http://www.crufty.net/sjg/docs/freebsd-meta-mode.htm. -.Pp -The build is driven by dirdeps.mk using -.Va DIRDEPS -stored in -Makefile.depend files found in each directory. -.Pp -The build can be started from anywhere, and behaves the same. -The initial instance of -.Xr make 1 -recursively reads -.Va DIRDEPS -from Makefile.depend -computing a graph of tree dependencies from the current origin. -Setting -.Va NO_DIRDEPS -will skip checking dirdep dependencies and will only build in the current -directory. -.Pp -As each target is made -.Xr make 1 -produces a meta file which is used to capture (and compare) -the command line, -as well as any command output. -If -.Xr filemon 4 -is available the meta file will also capture a record of files -used to produce the target by tracking syscalls. -.Pp -The build will hide commands ran unless -.Va NO_SILENT -is defined. -.Pp -When set, it also enforces the following options: -.Pp -.Bl -item -compact -.It -.Va WITH_INSTALL_AS_USER -.El -.Pp -When set, the following options are also in effect: -.Pp -.Bl -inset -compact -.It Va WITH_AUTO_OBJ -(unless -.Va WITHOUT_AUTO_OBJ -is set explicitly) -.It Va WITH_STAGING -(unless -.Va WITHOUT_STAGING -is set explicitly) -.It Va WITH_STAGING_MAN -(unless -.Va WITHOUT_STAGING_MAN -is set explicitly) -.It Va WITH_STAGING_PROG -(unless -.Va WITHOUT_STAGING_PROG -is set explicitly) -.It Va WITH_SYSROOT -(unless -.Va WITHOUT_SYSROOT -is set explicitly) -.El +.\" from FreeBSD: head/tools/build/options/WITH_META_MODE 290816 2015-11-14 03:24:48Z sjg +Create meta files when not doing DIRDEPS_BUILD. +The meta files can be useful for debugging. .Pp This must be set in the environment, make command line, or .Pa /etc/src-env.conf , @@ -1276,13 +1277,13 @@ Set to not build kernel modules that inc .\" from FreeBSD: head/tools/build/options/WITHOUT_SSP 180012 2008-06-25 21:33:28Z ru Set to not build world with propolice stack smashing protection. .It Va WITH_STAGING -.\" from FreeBSD: head/tools/build/options/WITH_STAGING 284708 2015-06-22 20:21:57Z sjg +.\" from FreeBSD: head/tools/build/options/WITH_STAGING 290816 2015-11-14 03:24:48Z sjg Enable staging of files to a stage tree. This can be best thought of as auto-install to .Va DESTDIR with some extra meta data to ensure dependencies can be tracked. Depends on -.Va WITH_META_MODE . +.Va WITH_DIRDEPS_BUILD . When set, the following options are also in effect: .Pp .Bl -inset -compact @@ -1329,10 +1330,10 @@ Set to not build .Xr syscons 4 support files such as keyboard maps, fonts, and screen output maps. .It Va WITH_SYSROOT -.\" from FreeBSD: head/tools/build/options/WITH_SYSROOT 284708 2015-06-22 20:21:57Z sjg +.\" from FreeBSD: head/tools/build/options/WITH_SYSROOT 290816 2015-11-14 03:24:48Z sjg Enable use of sysroot during build. Depends on -.Va WITH_META_MODE . +.Va WITH_DIRDEPS_BUILD . .Pp This must be set in the environment, make command line, or .Pa /etc/src-env.conf , Modified: head/tools/build/options/makeman ============================================================================== --- head/tools/build/options/makeman Sat Nov 14 03:24:48 2015 (r290816) +++ head/tools/build/options/makeman Sat Nov 14 04:50:28 2015 (r290817) @@ -198,6 +198,7 @@ variable, which defaults to .Pa /etc/src-env.conf . Some examples that may only be set in this file are .Va MAKEOBJDIRPREFIX , +.Va WITH_DIRDEPS_BUILD , and .Va WITH_META_MODE as they are environment-only variables.