From owner-svn-src-head@freebsd.org Thu Sep 17 20:33:54 2015 Return-Path: Delivered-To: svn-src-head@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 72B889CED69; Thu, 17 Sep 2015 20:33:54 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 49475106D; Thu, 17 Sep 2015 20:33:54 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8HKXsYx087803; Thu, 17 Sep 2015 20:33:54 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8HKXr1M087800; Thu, 17 Sep 2015 20:33:53 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201509172033.t8HKXr1M087800@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 17 Sep 2015 20:33:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287932 - in head: share/mk 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2015 20:33:54 -0000 Author: bdrewery Date: Thu Sep 17 20:33:52 2015 New Revision: 287932 URL: https://svnweb.freebsd.org/changeset/base/287932 Log: src.conf.5: Make it self-documenting that the mkopts are environment-only. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/sys.mk head/tools/build/options/WITH_META_MODE head/tools/build/options/makeman Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Thu Sep 17 20:21:55 2015 (r287931) +++ head/share/mk/sys.mk Thu Sep 17 20:33:52 2015 (r287932) @@ -29,6 +29,11 @@ __DEFAULT_DEPENDENT_OPTIONS= \ STAGING/META_MODE \ SYSROOT/META_MODE +__ENV_ONLY_OPTIONS:= \ + ${__DEFAULT_NO_OPTIONS} \ + ${__DEFAULT_YES_OPTIONS} \ + ${__DEFAULT_DEPENDENT_OPTIONS:H} + # early include for customization # see local.sys.mk below # Not included when building in fmake compatibility mode (still needed Modified: head/tools/build/options/WITH_META_MODE ============================================================================== --- head/tools/build/options/WITH_META_MODE Thu Sep 17 20:21:55 2015 (r287931) +++ head/tools/build/options/WITH_META_MODE Thu Sep 17 20:33:52 2015 (r287932) @@ -25,11 +25,6 @@ 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 20:21:55 2015 (r287931) +++ head/tools/build/options/makeman Thu Sep 17 20:33:52 2015 (r287932) @@ -221,6 +221,7 @@ EOF show with SRCCONF=/dev/null | sort | sed 's/$/=/' > $t/src.conf show settings SRCCONF=$t/src.conf | sort > $t/config_WITH_ALL show without SRCCONF=/dev/null | sort > $t/config_WITHOUT_ALL + env_only_options="$(${make} -V __ENV_ONLY_OPTIONS)" show_options | while read opt targets ; do @@ -289,6 +290,17 @@ EOF done echo '.El' fi + + case " ${env_only_options} " in + *\ ${opt#*_}\ *) + echo ".Pp" + echo "This must be set in the environment or" + echo ".Pa /etc/src-env.conf ," + echo "not" + echo ".Pa /etc/src.conf ." + ;; + esac + twiddle >&2 done cat <