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 <<EOF
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
