From owner-svn-src-head@FreeBSD.ORG Mon Apr 1 16:35:27 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B98619D7; Mon, 1 Apr 2013 16:35:27 +0000 (UTC) (envelope-from utisoft@gmail.com) Received: from mail-ia0-x234.google.com (mail-ia0-x234.google.com [IPv6:2607:f8b0:4001:c02::234]) by mx1.freebsd.org (Postfix) with ESMTP id 687B71B6; Mon, 1 Apr 2013 16:35:27 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f27so1995198iae.39 for ; Mon, 01 Apr 2013 09:35:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; bh=VIcwd3qM9C4CWGYTZX4rVxO08BEbBz2VryJFECxMWD4=; b=Fq4XrU5ndvS9pSCvj4LCvuDtzYaJD9KtrAW+mGBBWT5kRVjiZmx6IVlez+70jrfpG0 0ocHfGVWEy24S6vmFxp+MB3qjvnGQIGp4SP+HSr0jp8ZJDsAaUiDB01lTle2g9keXYle XtGHA9sOA30rulUucQyYs0ADpsYJDkGyf4cA3/5lO3abjpoCyCelR/O5OhkFaCInEL0i j5uAXUFPkNi+q/p5OU5WtqN/ElYzSrDDfAMHnylYTdPsWVRnKvtYDBm+w0fDYyrw4aox KR/joCtXxoIigOyWkYjq8x2SNAv2irDNWqVHMgCfgerof/s41+KWlKOHdZDu+2ABpKsi X8gw== X-Received: by 10.50.13.175 with SMTP id i15mr3827753igc.75.1364834127122; Mon, 01 Apr 2013 09:35:27 -0700 (PDT) MIME-Version: 1.0 Sender: utisoft@gmail.com Received: by 10.64.58.52 with HTTP; Mon, 1 Apr 2013 09:34:57 -0700 (PDT) In-Reply-To: <201304011217.41274.jhb@freebsd.org> References: <201303262011.r2QKBAjm094760@svn.freebsd.org> <201304011217.41274.jhb@freebsd.org> From: Chris Rees Date: Mon, 1 Apr 2013 17:34:57 +0100 X-Google-Sender-Auth: YTJivWteqFGj_cccmppzKlsaFAY Message-ID: Subject: Re: svn commit: r248751 - head/share/mk To: John Baldwin Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Ed Maste 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 16:35:27 -0000 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... Chris