From owner-svn-src-head@FreeBSD.ORG Mon Apr 1 17:17:49 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 A51C4C8E; Mon, 1 Apr 2013 17:17:49 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-ob0-x235.google.com (mail-ob0-x235.google.com [IPv6:2607:f8b0:4003:c01::235]) by mx1.freebsd.org (Postfix) with ESMTP id 4112C395; Mon, 1 Apr 2013 17:17:49 +0000 (UTC) Received: by mail-ob0-f181.google.com with SMTP id ni5so2041416obc.26 for ; Mon, 01 Apr 2013 10:17:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=xmvkBn0y7tHfoBgNDPKzMrlX6QNmovtWO3MF9S1E/4Y=; b=C9aPNt+H34RT411KqtAujg426TI2wvBCvoGnN9NUBrddMEDzA9rK+GZA8l4qdkM7QW 7hcALjy1dCR7JJBYba8wgonyT25vvEioi4hiP9dP7Vx2XJ7dHWM3PfOcHQufPMMST2/X 2PF9Es9d4r6Rh6aH4otLUtrB+NXNnFAa2cIj9fSP+e2QbMms52RbcPp38teqoMKxgDdy UNEONaWudq2HsREfz/q2TGutsql5v/+U6Po1bdd2/dHD8HVxFiu55+kSFzGmkOsWA6Ne JpibuF9oIUwuJgKLXe1/bqPD5ATetK+pKAydDKE+oQsA42/JS9cAu5z8WvxLK9wWZ29u D6vw== MIME-Version: 1.0 X-Received: by 10.182.139.37 with SMTP id qv5mr4155935obb.92.1364836668863; Mon, 01 Apr 2013 10:17:48 -0700 (PDT) Sender: carpeddiem@gmail.com Received: by 10.60.132.142 with HTTP; Mon, 1 Apr 2013 10:17:48 -0700 (PDT) In-Reply-To: References: <201303262011.r2QKBAjm094760@svn.freebsd.org> <201304011217.41274.jhb@freebsd.org> Date: Mon, 1 Apr 2013 13:17:48 -0400 X-Google-Sender-Auth: zTVlWeI_Ua_vWTN2jIhaP5iXq8M Message-ID: Subject: Re: svn commit: r248751 - head/share/mk From: Ed Maste To: Chris Rees Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, John Baldwin 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 17:17:49 -0000 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. -Ed