From owner-svn-src-all@freebsd.org Thu Oct 8 18:40:17 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 C7D9A9D2A4E for ; Thu, 8 Oct 2015 18:40:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qg0-f42.google.com (mail-qg0-f42.google.com [209.85.192.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8DB10E43 for ; Thu, 8 Oct 2015 18:40:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by qgx61 with SMTP id 61so49813080qgx.3 for ; Thu, 08 Oct 2015 11:40:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=G9l/G+l2aMgIsGcKlUOKAV1SdR80RUYcp8M/a6FJGzE=; b=hPErZSPjig7mAAd56DCQrWVdZKGD8wmTRa/8BuH9deAw/gPrNTftxGFMWWSzViiVxb Dyt+Jktu+/Lgm8CZ81Ni6BHT5gXqkyPwwtGgqz+B5d+2oi/TokZZOBvhL8Gmy19yDJvM qmdxC02l95nAKB8bORNQBGESqAuGASn8XGlqeu1JXAH4hmTP07V5+I5QtA14rO4OxAx4 7kKOz1PjgLj89lDKJLrs0p4ZTMpJUAQFk+wLYapjtErUuGzcDXzfy4+JrRoqEv0aFI4H BROp8pldetL3XarcFcxWdbNUoxdn5EP7kOTy5ROsCnlHrZn3z8fv/+vu1+QxlO5TvuNU tP4g== X-Gm-Message-State: ALoCoQn7s5la/bdHheUdDxInQDMIvkdkoyiD1QpvHi/O9UC4kFy1ZjuVInuuQI9O5ivFwW5tVD4T MIME-Version: 1.0 X-Received: by 10.140.234.78 with SMTP id f75mr11025197qhc.20.1444329609786; Thu, 08 Oct 2015 11:40:09 -0700 (PDT) Sender: wlosh@bsdimp.com Received: by 10.140.80.167 with HTTP; Thu, 8 Oct 2015 11:40:09 -0700 (PDT) X-Originating-IP: [69.53.245.8] In-Reply-To: <561693EF.50808@FreeBSD.org> References: <201510060418.t964Innu071170@repo.freebsd.org> <56140CAD.8080200@FreeBSD.org> <8D5D1CE5-BC57-464D-9C47-63EFF4C1CF2F@bsdimp.com> <5615C935.2060204@FreeBSD.org> <561693EF.50808@FreeBSD.org> Date: Thu, 8 Oct 2015 12:40:09 -0600 X-Google-Sender-Auth: zXj2fLKLbTzVnPKkQ9jekTM8BmY Message-ID: Subject: Re: svn commit: r288911 - head/share/mk From: Warner Losh To: Bryan Drewery Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.20 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 18:40:18 -0000 On Thu, Oct 8, 2015 at 10:03 AM, Bryan Drewery wrote= : > On 10/8/15 9:00 AM, Warner Losh wrote: > > > > On Wed, Oct 7, 2015 at 7:39 PM, Bryan Drewery > > wrote: > > > > 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 > include 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 > the 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. > > > > 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 ? > > > > > > 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. > > > > 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 > checkout! > If you haven't made a commit yet, I'd be keen on reviewing the change. Warner