svn commit: r266756 - head/share/mk

[Warner Losh]

Author: imp
Date: Tue May 27 16:30:54 2014
New Revision: 266756
URL: http://svnweb.freebsd.org/changeset/base/266756

Log:
  Better documentation for why KERBEROS and OPENSSH are here, and where
  to look for all the other options that used to be here (well, in
  bsd.own.mk)
  
  Suggested by: des@

Modified:
  head/share/mk/bsd.opts.mk
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.opts.mk
==============================================================================
--- head/share/mk/bsd.opts.mk	Tue May 27 16:17:25 2014	(r266755)
+++ head/share/mk/bsd.opts.mk	Tue May 27 16:30:54 2014	(r266756)
@@ -40,8 +40,13 @@ __<bsd.opts.mk>__:
 # that haven't been converted over.
 #
 
-# Only these options are used by bsd.*.mk. Most seem legit, except maybe
-# OPENSSH.
+# Only these options are used by bsd.*.mk. KERBEROS and OPENSSH are
+# unforutnately needed to support statically linking the entire
+# tree. su(1) wouldn't link since it depends on PAM which depends on
+# ssh libraries when building with OPENSSH, and likewise for KERBEROS.
+
+# All other variables used to build /usr/src live in src.opts.mk
+# and variables from both files are documented in src.conf(5).
 
 __DEFAULT_YES_OPTIONS = \
     ASSERT_DEBUG \

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Tue May 27 16:17:25 2014	(r266755)
+++ head/share/mk/bsd.own.mk	Tue May 27 16:30:54 2014	(r266756)
@@ -122,7 +122,7 @@
 .if !target(__<bsd.own.mk>__)
 __<bsd.own.mk>__:
 
-.include <bsd.opts.mk>
+.include <bsd.opts.mk>		# options now here or src.opts.mk
 
 .if !defined(_WITHOUT_SRCCONF)