From owner-svn-src-all@freebsd.org Thu Oct 8 16:00:37 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 834329D1EDC for ; Thu, 8 Oct 2015 16:00:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk0-f177.google.com (mail-qk0-f177.google.com [209.85.220.177]) (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 44C3B7F9 for ; Thu, 8 Oct 2015 16:00:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by qkht68 with SMTP id t68so21009547qkh.3 for ; Thu, 08 Oct 2015 09:00:30 -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=EU9iM7Fe7xWJ8uDXCxRDTxjFXDasCVF5LjlvygLU9ng=; b=THpmy8VyJfAS0/KD6bwY/LPJ6rHU60tvFMg4qd3CnXGHzRpjwsDruY6BrUFATdW8QE qlg15bpNYznZ/LMT+UwjK/iya0JtJ0LtwzMaqulqcs2L7bX65bpOD3ZakUxXsJNDFFZX 6LmBrZgt3JwAna1i49i6yv4Nw0h039nBlwQjmrtVD2EoM1qamanZVggH+VWa/1wHWhtD DVCalcw/hQUk/qsdTG+jqKP1gDoDf9HkLqMuNUCVxq2FtNWV5hEMilVgBcZXdxLxqCLr sTqyT+GZAU458RkDR966nz6lmw2XBI02JrdDhWHlDBvXUeKoP4QN9+/xUSSWYUHeDer3 jWRQ== X-Gm-Message-State: ALoCoQmVVPzo+ufgCluFAbEi9Byz3Ba2Gc8rS4KNtUwpltO1BFQLPbUKYduRLqYl/mm2HoEQ8rOu MIME-Version: 1.0 X-Received: by 10.55.21.90 with SMTP id f87mr9304801qkh.46.1444320030243; Thu, 08 Oct 2015 09:00:30 -0700 (PDT) Sender: wlosh@bsdimp.com Received: by 10.140.80.167 with HTTP; Thu, 8 Oct 2015 09:00:30 -0700 (PDT) X-Originating-IP: [50.253.99.174] In-Reply-To: <5615C935.2060204@FreeBSD.org> References: <201510060418.t964Innu071170@repo.freebsd.org> <56140CAD.8080200@FreeBSD.org> <8D5D1CE5-BC57-464D-9C47-63EFF4C1CF2F@bsdimp.com> <5615C935.2060204@FreeBSD.org> Date: Thu, 8 Oct 2015 10:00:30 -0600 X-Google-Sender-Auth: 3n_f5w-nkkR4ucqhm6dpXCxGQYs 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 16:00:37 -0000 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.conf 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, though = it is > easily > > scripted. I=E2=80=99d thought of this solution at the time I did the MA= KESYSPATH > > 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/s= hare/mk > > to work out. I was rather hoping we could find some good way around > > 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. Warner