Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Sep 2015 17:45:21 +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: r287925 - in head: share/man/man5 tools/build/options
Message-ID:  <201509171745.t8HHjLAe016523@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Thu Sep 17 17:45:20 2015
New Revision: 287925
URL: https://svnweb.freebsd.org/changeset/base/287925

Log:
  Document src-env.conf and note its use for MAKEOBJDIRPREFIX and WITH_META_MDOE.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/man/man5/Makefile
  head/tools/build/options/WITH_META_MODE
  head/tools/build/options/makeman

Modified: head/share/man/man5/Makefile
==============================================================================
--- head/share/man/man5/Makefile	Thu Sep 17 17:35:06 2015	(r287924)
+++ head/share/man/man5/Makefile	Thu Sep 17 17:45:20 2015	(r287925)
@@ -78,6 +78,7 @@ MLINKS+=portindex.5 INDEX.5
 MLINKS+=quota.user.5 quota.group.5
 MLINKS+=rc.conf.5 rc.conf.local.5
 MLINKS+=resolver.5 resolv.conf.5
+MLINKS+=src.conf.5 src-env.conf.5
 
 .if ${MK_AUTOFS} != "no"
 MAN+=	autofs.5

Modified: head/tools/build/options/WITH_META_MODE
==============================================================================
--- head/tools/build/options/WITH_META_MODE	Thu Sep 17 17:35:06 2015	(r287924)
+++ head/tools/build/options/WITH_META_MODE	Thu Sep 17 17:45:20 2015	(r287925)
@@ -25,6 +25,11 @@ If
 is available the meta file will also capture a record of files
 used to produce the target by tracking syscalls.
 .Pp
+This must be set in the environment or
+.Pa /etc/src-env.conf ,
+not
+.Pa /etc/src.conf .
+.Pp
 The build will hide commands ran unless
 .Va NO_SILENT
 is defined.

Modified: head/tools/build/options/makeman
==============================================================================
--- head/tools/build/options/makeman	Thu Sep 17 17:35:06 2015	(r287924)
+++ head/tools/build/options/makeman	Thu Sep 17 17:45:20 2015	(r287925)
@@ -188,6 +188,18 @@ option of
 or in its environment; see
 .Xr environ 7 .
 .Pp
+The environment of
+.Xr make 1
+for the build can be controlled via the
+.Va SRC_ENV_CONF
+variable, which defaults to
+.Pa /etc/src-env.conf .
+Some examples that may only be set in this file are
+.Va MAKEOBJDIRPREFIX ,
+and
+.Va WITH_META_MODE
+as they are environment-only variables.
+.Pp
 The values of variables are ignored regardless of their setting;
 even if they would be set to
 .Dq Li FALSE
@@ -284,6 +296,7 @@ EOF
 .Sh FILES
 .Bl -tag -compact -width Pa
 .It Pa /etc/src.conf
+.It Pa /etc/src-env.conf
 .It Pa /usr/share/mk/bsd.own.mk
 .El
 .Sh SEE ALSO



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509171745.t8HHjLAe016523>