From owner-svn-src-all@freebsd.org Thu Oct 8 16:04:10 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1BBC19D2218; Thu, 8 Oct 2015 16:04:10 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 0569CB6B; Thu, 8 Oct 2015 16:04:10 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id F19991F6F; Thu, 8 Oct 2015 16:04:09 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 896B413CF1; Thu, 8 Oct 2015 16:04:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id qhSZXQIay-S5; Thu, 8 Oct 2015 16:04:03 +0000 (UTC) Subject: Re: svn commit: r288911 - head/share/mk DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 949CF13CE3 To: Warner Losh References: <201510060418.t964Innu071170@repo.freebsd.org> <56140CAD.8080200@FreeBSD.org> <8D5D1CE5-BC57-464D-9C47-63EFF4C1CF2F@bsdimp.com> <5615C935.2060204@FreeBSD.org> Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" From: Bryan Drewery Organization: FreeBSD Message-ID: <561693EF.50808@FreeBSD.org> Date: Thu, 8 Oct 2015 09:03:59 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Oct 2015 16:04:10 -0000 On 10/8/15 9:00 AM, Warner Losh wrote: >=20 > On Wed, Oct 7, 2015 at 7:39 PM, Bryan Drewery > wrote: >=20 > On 10/6/2015 1:24 PM, Warner Losh wrote: > >> With the META_MODE changes, sjg introduced this /etc/src-env.con= f file > >> that is included from sys.mk early, that can be = used for overriding > >> things like MAKEOBJDIRPREFIX, enabling META_MODE (it needs to be= set > >> extremely early for AUTO_OBJ support, among other things). > >> > >> As far as I can tell, the sys.mk change to inclu= de src.conf early was > >> done out of convenience. Meaning, we could remove that and just= add > >> back a .include > or similar at= the top of all src > Makefiles. > > All src makefiles? Yea, I=E2=80=99d rather hoped to avoid that, t= hough it is easily > > scripted. I=E2=80=99d thought of this solution at the time I did = the MAKESYSPATH > > hack, and rejected it as being too unwieldy. And having that at t= he top > > of all the files would still require MAKESYSPATH need to be =E2=80= =A6/share/mk > > to work out. I was rather hoping we could find some good way arou= nd > > doing that. >=20 > r289000 confuses me. Clearly src.opts.mk is > still needed in Makefiles. > So why are we including src.conf in sys.mk and not > src.opts.mk ? >=20 >=20 > We're including it there because Simon wanted it included there so > meta-mode settings were visible in sys.mk . I thought it > lame at the > time, but had no better solution. >=20 Ah! So the /etc/src-env.conf thing I referenced does replace it. So we can remove src.conf from sys.mk now. It came in via r284598, and I documented it and added it to src.conf.5/makeman later on. I'll go ahead and do that since there's no impact to meta mode now. That at least resolves my issues with nested port builds - ignoring that src.*.mk still gets included which I haven't had a problem with and is my own fault and intention given I want the MAKESYSPATH from local checko= ut! --=20 Regards, Bryan Drewery