From owner-svn-src-all@FreeBSD.ORG Fri Mar 27 02:35:12 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CAD9B7D2; Fri, 27 Mar 2015 02:35:12 +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 9C449CE; Fri, 27 Mar 2015 02:35:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2R2ZC6Q047156; Fri, 27 Mar 2015 02:35:12 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2R2ZCwp047154; Fri, 27 Mar 2015 02:35:12 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201503270235.t2R2ZCwp047154@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 27 Mar 2015 02:35:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280727 - in head: share/mk sys/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2015 02:35:12 -0000 Author: imp Date: Fri Mar 27 02:35:11 2015 New Revision: 280727 URL: https://svnweb.freebsd.org/changeset/base/280727 Log: Add support for specifying unsupported / broken options that override any defaults or user specified actions on the command line. This would be useful for specifying features that are always broken or that cannot make sense on a specific architecture, like ACPI on pc98 or EISA on !i386 (!x86 usage of EISA is broken and there's no supported hardware that could have it in any event). Any items in __ALWAYS_NO_OPTIONS are forced to "no" regardless of other settings. Differential Revision: https://reviews.freebsd.org/D2011 Modified: head/share/mk/bsd.mkopt.mk head/sys/conf/kern.opts.mk Modified: head/share/mk/bsd.mkopt.mk ============================================================================== --- head/share/mk/bsd.mkopt.mk Fri Mar 27 02:01:22 2015 (r280726) +++ head/share/mk/bsd.mkopt.mk Fri Mar 27 02:35:11 2015 (r280727) @@ -67,6 +67,15 @@ MK_${var}:= no # MK_* options which are always no, usually because they are # unsupported/badly broken on this architecture. # +.for var in ${__ALWAYS_NO_OPTIONS} +MK_${var}:= no +.endfor +.undef __ALWAYS_NO_OPTIONS + +# +# MK_* options which are always no, usually because they are +# unsupported/badly broken on this architecture. +# .for var in ${BROKEN_OPTIONS} MK_${var}:= no .endfor Modified: head/sys/conf/kern.opts.mk ============================================================================== --- head/sys/conf/kern.opts.mk Fri Mar 27 02:01:22 2015 (r280726) +++ head/sys/conf/kern.opts.mk Fri Mar 27 02:35:11 2015 (r280727) @@ -120,6 +120,16 @@ MK_${var}:= no #end of bsd.mkopt.mk expanded inline. # +# MK_* options which are always no, usually because they are +# unsupported/badly broken on this architecture. +# +.for var in ${__ALWAYS_NO_OPTIONS} +MK_${var}:= no +.endfor +.undef __ALWAYS_NO_OPTIONS +#end of bsd.mkopt.mk expanded inline. + +# # MK_*_SUPPORT options which default to "yes" unless their corresponding # MK_* variable is set to "no". #