From owner-freebsd-arch@FreeBSD.ORG  Sun Oct  7 00:15:27 2012
Return-Path: <owner-freebsd-arch@FreeBSD.ORG>
Delivered-To: freebsd-arch@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5122F1065670
	for <freebsd-arch@freebsd.org>; Sun,  7 Oct 2012 00:15:27 +0000 (UTC)
	(envelope-from sjg@juniper.net)
Received: from exprod7og122.obsmtp.com (exprod7og122.obsmtp.com [64.18.2.22])
	by mx1.freebsd.org (Postfix) with ESMTP id B1B118FC0A
	for <freebsd-arch@freebsd.org>; Sun,  7 Oct 2012 00:15:26 +0000 (UTC)
Received: from P-EMHUB03-HQ.jnpr.net ([66.129.224.36]) (using TLSv1) by
	exprod7ob122.postini.com ([64.18.6.12]) with SMTP
	ID DSNKUHDJmNYsHBfNyX+ty6htzqfUemlRl+0G@postini.com;
	Sat, 06 Oct 2012 17:15:26 PDT
Received: from magenta.juniper.net (172.17.27.123) by P-EMHUB03-HQ.jnpr.net
	(172.24.192.33) with Microsoft SMTP Server (TLS) id 8.3.213.0;
	Sat, 6 Oct 2012 17:14:24 -0700
Received: from chaos.jnpr.net (chaos.jnpr.net [172.24.29.229])	by
	magenta.juniper.net (8.11.3/8.11.3) with ESMTP id q970ENh00745	for
	<freebsd-arch@freebsd.org>; Sat, 6 Oct 2012 17:14:23 -0700 (PDT)
	(envelope-from sjg@juniper.net)
Received: from chaos.jnpr.net (localhost [127.0.0.1])	by chaos.jnpr.net
	(Postfix) with ESMTP id 9878F58094	for <freebsd-arch@freebsd.org>;
	Sat,  6 Oct 2012 17:14:23 -0700 (PDT)
To: <freebsd-arch@freebsd.org>
X-Mailer: MH-E 7.82+cvs; nmh 1.3; GNU Emacs 22.3.1
Date: Sat, 6 Oct 2012 17:14:23 -0700
From: Simon Gerraty <sjg@juniper.net>
Message-ID: <20121007001423.9878F58094@chaos.jnpr.net>
MIME-Version: 1.0
Content-Type: text/plain
Subject: bsd.own.mk - just let WITHOUT_* take precedence
X-BeenThere: freebsd-arch@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussion related to FreeBSD architecture <freebsd-arch.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-arch>
List-Post: <mailto:freebsd-arch@freebsd.org>
List-Help: <mailto:freebsd-arch-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Oct 2012 00:15:27 -0000

After being bitten by:

make: "/b/sjg/work/fbsd-head/src/share/mk/bsd.own.mk" line 490: WITH_CTF
and WITHOUT_CTF can't both be set.

I took a look at bsd.own.mk
I'm not sure what's so evil about setting both WITH_ and WITHOUT_
especially when bits of buildworld, buildkernel etc, set WITHOUT_
(which triggers the problem for me).

All that seems necessary is a clear rule - "WITHOUT_ wins".
Thus the patch below solve my problem.

Index: share/mk/bsd.own.mk
===================================================================
--- share/mk/bsd.own.mk	(revision 241871)
+++ share/mk/bsd.own.mk	(working copy)
@@ -468,9 +468,6 @@ __DEFAULT_NO_OPTIONS+=FDT
 # MK_* options which default to "yes".
 #
 .for var in ${__DEFAULT_YES_OPTIONS}
-.if defined(WITH_${var}) && defined(WITHOUT_${var})
-.error WITH_${var} and WITHOUT_${var} can't both be set.
-.endif
 .if defined(MK_${var})
 .error MK_${var} can't be set by a user.
 .endif
@@ -486,13 +483,10 @@ MK_${var}:=	yes
 # MK_* options which default to "no".
 #
 .for var in ${__DEFAULT_NO_OPTIONS}
-.if defined(WITH_${var}) && defined(WITHOUT_${var})
-.error WITH_${var} and WITHOUT_${var} can't both be set.
-.endif
 .if defined(MK_${var})
 .error MK_${var} can't be set by a user.
 .endif
-.if defined(WITH_${var})
+.if defined(WITH_${var}) && !defined(WITHOUT_${var})
 MK_${var}:=	yes
 .else
 MK_${var}:=	no