diff options
| author | imp <imp@FreeBSD.org> | 2014-05-27 16:30:54 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-05-27 16:30:54 +0000 |
| commit | 69da6adf7d5161e1d513f1501d63a9469253adaa (patch) | |
| tree | 623fc97f91c956964dbac5bfae6ce36da9e12a21 /share | |
| parent | ebcdfbbc65ba4f76d517a36eeea0e650da57c355 (diff) | |
| download | FreeBSD-src-69da6adf7d5161e1d513f1501d63a9469253adaa.zip FreeBSD-src-69da6adf7d5161e1d513f1501d63a9469253adaa.tar.gz | |
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@
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.opts.mk | 9 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 327b997..51d6c03 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -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 \ diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 952ca21..486914b 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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) |
