From owner-svn-src-head@FreeBSD.ORG Mon Apr 1 19:01:52 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id F3701D47; Mon, 1 Apr 2013 19:01:51 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) by mx1.freebsd.org (Postfix) with ESMTP id CD1F79C3; Mon, 1 Apr 2013 19:01:51 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 06E70B94C; Mon, 1 Apr 2013 15:01:51 -0400 (EDT) From: John Baldwin To: Ed Maste Subject: Re: svn commit: r248751 - head/share/mk Date: Mon, 1 Apr 2013 13:23:41 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p25; KDE/4.5.5; amd64; ; ) References: <201303262011.r2QKBAjm094760@svn.freebsd.org> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201304011323.42111.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 01 Apr 2013 15:01:51 -0400 (EDT) Cc: Chris Rees , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 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: Mon, 01 Apr 2013 19:01:52 -0000 On Monday, April 01, 2013 1:17:48 pm Ed Maste wrote: > On 1 April 2013 12:34, Chris Rees wrote: > > On 1 April 2013 17:17, John Baldwin wrote: > >> On Tuesday, March 26, 2013 4:11:10 pm Ed Maste wrote: > >>> Author: emaste > >>> Date: Tue Mar 26 20:11:09 2013 > >>> New Revision: 248751 > >>> URL: http://svnweb.freebsd.org/changeset/base/248751 > >>> > >>> Log: > >>> Unconditionally include ${SRCCONF} if overridden > >>> > >>> This avoids silently failing to include ${SRCCONF} specified by a make(1) > >>> invocation. > >>> > >>> Modified: > >>> head/share/mk/bsd.own.mk > >>> > >>> Modified: head/share/mk/bsd.own.mk > >>> > >> ============================================================================== > >>> --- head/share/mk/bsd.own.mk Tue Mar 26 20:04:45 2013 (r248750) > >>> +++ head/share/mk/bsd.own.mk Tue Mar 26 20:11:09 2013 (r248751) > >>> @@ -117,7 +117,7 @@ ____: > >>> > >>> .if !defined(_WITHOUT_SRCCONF) > >>> SRCCONF?= /etc/src.conf > >>> -.if exists(${SRCCONF}) > >>> +.if exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf" > >>> .include "${SRCCONF}" > >>> .endif > >>> .endif > >> > >> Hmm, I'm confused why this matters? Was exists() failing for a file that did > >> exist? Can you give a more specific use case? > > > > I think it's useful that if you've set SRCCONF in make.conf, the build > > should complain about a lack of its existence. > > > > A single character spelling error in the name of SRCCONF will have the > > build silently failing to include it, thus resulting in enormous > > frustration when your settings aren't applied for some non-obvious > > reason... > > Exactly. In my case I had incorrectly specified the path to my > src.conf and it took longer than I'd like to admit to discover the > failure. Ahhh, ok. That makes sense then. I had parsed the log message differently somehow to mean that the file wasn't being included and that that was silent, not that there was a lack of an error for a non-existent file that was explicitly specified. -- John Baldwin