From owner-freebsd-testing@FreeBSD.ORG Thu Jan 23 21:48:43 2014 Return-Path: Delivered-To: freebsd-testing@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 277F4CA4; Thu, 23 Jan 2014 21:48:43 +0000 (UTC) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe005.messaging.microsoft.com [216.32.181.185]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BF6BB1F99; Thu, 23 Jan 2014 21:48:42 +0000 (UTC) Received: from mail123-ch1-R.bigfish.com (10.43.68.228) by CH1EHSOBE010.bigfish.com (10.43.70.60) with Microsoft SMTP Server id 14.1.225.22; Thu, 23 Jan 2014 21:03:16 +0000 Received: from mail123-ch1 (localhost [127.0.0.1]) by mail123-ch1-R.bigfish.com (Postfix) with ESMTP id 866F040016A; Thu, 23 Jan 2014 21:03:16 +0000 (UTC) X-Forefront-Antispam-Report: CIP:66.129.239.11; KIP:(null); UIP:(null); IPV:NLI; H:P-EMF02-SAC.jnpr.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VPS0(zz103dK1432Idf9Izz1f42h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah21bch1fc6h1082kz8dhz1de097h74efjz31h2a8h839hd25hf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h14ddh1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh1b88h224fh1fb3h1d0ch1d2eh1d3fh1de2h1dfeh1dffh1e23h1fe8h1ff5h2218h2216h226dh22d0h24afh2327h2336h2381h2438h2461h2487h24ach24d7h1155h) Received-SPF: softfail (mail123-ch1: transitioning domain of juniper.net does not designate 66.129.239.11 as permitted sender) client-ip=66.129.239.11; envelope-from=sjg@juniper.net; helo=P-EMF02-SAC.jnpr.net ; SAC.jnpr.net ; Received: from mail123-ch1 (localhost.localdomain [127.0.0.1]) by mail123-ch1 (MessageSwitch) id 1390510994895815_17923; Thu, 23 Jan 2014 21:03:14 +0000 (UTC) Received: from CH1EHSMHS005.bigfish.com (snatpool2.int.messaging.microsoft.com [10.43.68.236]) by mail123-ch1.bigfish.com (Postfix) with ESMTP id D5D5EC0047; Thu, 23 Jan 2014 21:03:14 +0000 (UTC) Received: from P-EMF02-SAC.jnpr.net (66.129.239.11) by CH1EHSMHS005.bigfish.com (10.43.70.5) with Microsoft SMTP Server (TLS) id 14.16.227.3; Thu, 23 Jan 2014 21:03:14 +0000 Received: from magenta.juniper.net (172.17.27.123) by P-EMF02-SAC.jnpr.net (172.24.192.21) with Microsoft SMTP Server (TLS) id 14.3.146.0; Thu, 23 Jan 2014 13:03:13 -0800 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 s0NL38L38198; Thu, 23 Jan 2014 13:03:08 -0800 (PST) (envelope-from sjg@juniper.net) Received: from chaos.jnpr.net (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 0E1D65807E; Thu, 23 Jan 2014 13:03:08 -0800 (PST) To: Garrett Cooper Subject: Re: Makefile.inc1.patch In-Reply-To: <9775878D-91AB-4BE4-ADFA-32D8DB582AA6@gmail.com> References: <4A3E3984-73D3-4441-97A7-D58679EFF978@gmail.com> <9775878D-91AB-4BE4-ADFA-32D8DB582AA6@gmail.com> Comments: In-reply-to: Garrett Cooper message dated "Thu, 23 Jan 2014 12:53:31 -0800." From: "Simon J. Gerraty" X-Mailer: MH-E 7.82+cvs; nmh 1.3; GNU Emacs 22.3.1 Date: Thu, 23 Jan 2014 13:03:08 -0800 Message-ID: <20140123210308.0E1D65807E@chaos.jnpr.net> MIME-Version: 1.0 Content-Type: text/plain X-OriginatorOrg: juniper.net X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% Cc: "freebsd-testing@freebsd.org" , brooks@freebsd.org, sjg@juniper.net X-BeenThere: freebsd-testing@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Testing on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jan 2014 21:48:43 -0000 [+brooks] On Thu, 23 Jan 2014 12:53:31 -0800, Garrett Cooper writes: > Here=92s the working patch. The difference between this one and = >the prior version is that you have to explicitly override -DNO_TESTS = >when building lib/atf* (Simon: do you have any comments?): Not crazy about frobbing ${MAKE} > >-.if ${MK_TESTS} !=3D "no" >+.if defined(WITH_ATF) || ${MK_TESTS} !=3D "no" >+# Make sure WITH_ATF overrules -DNO_TESTS >+.if !defined(WITH_ATF) >+MAKE+=3D -DWITH_ATF >+.endif Would it make sense to have ATF or TESTS depend on the other? As is that can't be done, since one cannot always safely include bsd.own.mk from the tree. I'd really like to see the WITH[OUT]_ processing separated to its own makefile (I use options.mk) so that it can always be safely used - even with an option list specific to a given makefile. The semantics in bsd.own.mk are quite broken and result in a lot of complex dancing to keep things working. > > I unrolled most of the local changes to Makefile.inc1 on my = >github fork so it=92ll be easier to spot if you diff it against my tree. >Thanks! >-Garrett