From owner-svn-src-head@FreeBSD.ORG Fri Apr 25 19:25:54 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E7C7D54E; Fri, 25 Apr 2014 19:25:53 +0000 (UTC) Received: from svn.freebsd.org (svn.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 C5A901C63; Fri, 25 Apr 2014 19:25:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3PJPrO3098702; Fri, 25 Apr 2014 19:25:53 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3PJPrjg098701; Fri, 25 Apr 2014 19:25:53 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201404251925.s3PJPrjg098701@svn.freebsd.org> From: Warner Losh Date: Fri, 25 Apr 2014 19:25:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264931 - head/share/mk 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.17 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: Fri, 25 Apr 2014 19:25:54 -0000 Author: imp Date: Fri Apr 25 19:25:53 2014 New Revision: 264931 URL: http://svnweb.freebsd.org/changeset/base/264931 Log: Split up the options into those used only by bsd.mk.* or sys.mk and 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. Modified: head/share/mk/bsd.opts.mk Modified: head/share/mk/bsd.opts.mk ============================================================================== --- head/share/mk/bsd.opts.mk Fri Apr 25 19:25:45 2014 (r264930) +++ head/share/mk/bsd.opts.mk Fri Apr 25 19:25:53 2014 (r264931) @@ -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 + +# 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 \ @@ -259,6 +272,29 @@ MK_${var}:=no .endfor # +# MK_* options that default to "yes" if the compiler is a C++11 compiler. +# +.include +.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 -.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