d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split up the options into those used only by bsd.mk.* or sys.mk and

Browse Source 
the rest. Add note of caution for the surprises that popped up. MK_SSP
is the only one used by sys.mk, and it likely needs even extra
attention.
This commit is contained in:
Warner Losh 2014-04-25 19:25:53 +00:00
parent 347c9de056
commit 7061d0855c
1 changed files with 51 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
share/mk/bsd.opts.mk
View File

@ -45,13 +45,40 @@ SRCCONF?= /etc/src.conf
# that haven't been converted over.
#
# Only these options are used by bsd.*.mk. Most seem legit, except maybe
# OPENSSH.
__DEFAULT_YES_OPTIONS = \
ASSERT_DEBUG \
INFO \
INSTALLLIB \
KERBEROS \
MAN \
MANCOMPRESS \
NIS \
OPENSSH \
PROFILE \
SSP \
SYMVER \
TOOLCHAIN
__DEFAULT_NO_OPTIONS = \
CTF \
DEBUG_FILES \
INSTALL_AS_USER \
.include <bsd.mkopt.mk>
# Note: __DEFAULT_{YES,NO}_OPTIONS unset by bsd.mkopt.mk
# These options are used by src the builds
__DEFAULT_YES_OPTIONS = \
ACCT \
ACPI \
AMD \
APM \
ARM_EABI \
ASSERT_DEBUG \
AT \
ATM \
AUDIT \
@ -98,13 +125,10 @@ __DEFAULT_YES_OPTIONS = \
ICONV \
INET \
INET6 \
INFO \
INSTALLLIB \
IPFILTER \
IPFW \
JAIL \
KDUMP \
KERBEROS \
KERNEL_SYMBOLS \
KVM \
LDNS \
@ -121,18 +145,14 @@ __DEFAULT_YES_OPTIONS = \
MAIL \
MAILWRAPPER \
MAKE \
MAN \
MANCOMPRESS \
NCURSESW \
NDIS \
NETCAT \
NETGRAPH \
NIS \
NLS \
NLS_CATALOGS \
NS_CACHING \
NTP \
OPENSSH \
OPENSSL \
PAM \
PC_SYSINSTALL \
@ -141,7 +161,6 @@ __DEFAULT_YES_OPTIONS = \
PMC \
PORTSNAP \
PPP \
PROFILE \
QUOTAS \
RCMDS \
RCS \
@ -153,16 +172,13 @@ __DEFAULT_YES_OPTIONS = \
SOURCELESS \
SOURCELESS_HOST \
SOURCELESS_UCODE \
SSP \
SVNLITE \
SYMVER \
SYSCALL_COMPAT \
SYSCONS \
SYSINSTALL \
TCSH \
TELNET \
TEXTPROC \
TOOLCHAIN \
UNBOUND \
USB \
UTMPX \
@ -175,11 +191,8 @@ __DEFAULT_YES_OPTIONS = \
__DEFAULT_NO_OPTIONS = \
BSD_GREP \
CLANG_EXTRAS \
CTF \
DEBUG_FILES \
EISA \
HESIOD \
INSTALL_AS_USER \
LLDB \
NAND \
OFED \
@ -258,6 +271,29 @@ MK_${var}:=no
.endif
.endfor
#
# MK_* options that default to "yes" if the compiler is a C++11 compiler.
#
.include <bsd.compiler.mk>
.for var in \
LIBCPLUSPLUS
.if !defined(MK_${var})
.if ${COMPILER_FEATURES:Mc++11}
.if defined(WITHOUT_${var})
MK_${var}:= no
.else
MK_${var}:= yes
.endif
.else
.if defined(WITH_${var})
MK_${var}:= yes
.else
MK_${var}:= no
.endif
.endif
.endif
.endfor
#
# Force some options off if their dependencies are off.
# Order is somewhat important.
@ -374,29 +410,6 @@ MK_${vv:H}:= ${MK_${vv:T}}
.endif
.endfor
#
# MK_* options that default to "yes" if the compiler is a C++11 compiler.
#
.include <bsd.compiler.mk>
.for var in \
LIBCPLUSPLUS
.if !defined(MK_${var})
.if ${COMPILER_FEATURES:Mc++11}
.if defined(WITHOUT_${var})
MK_${var}:= no
.else
MK_${var}:= yes
.endif
.else
.if defined(WITH_${var})
MK_${var}:= yes
.else
MK_${var}:= no
.endif
.endif
.endif
.endfor
.if !${COMPILER_FEATURES:Mc++11}
MK_LLDB:= no
.endif