From owner-freebsd-arch Thu Mar 8 20:14:27 2001 Delivered-To: freebsd-arch@freebsd.org Received: from obsecurity.dyndns.org (adsl-63-207-60-158.dsl.lsan03.pacbell.net [63.207.60.158]) by hub.freebsd.org (Postfix) with ESMTP id 55B4E37B719 for ; Thu, 8 Mar 2001 20:14:23 -0800 (PST) (envelope-from kris@obsecurity.org) Received: by obsecurity.dyndns.org (Postfix, from userid 1000) id C489966BCD; Thu, 8 Mar 2001 20:14:22 -0800 (PST) Date: Thu, 8 Mar 2001 20:14:22 -0800 From: Kris Kennaway To: Warner Losh Cc: "Rodney W. Grimes" , "Matthew D. Fuller" , Kris Kennaway , arch@FreeBSD.ORG Subject: Re: Breaking up make.conf Message-ID: <20010308201422.A94052@mollari.cthul.hu> References: <200103090241.SAA27525@gndrsh.dnsmgr.net> <200103090349.f293nGs04577@billy-club.village.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="3MwIy2ne0vdjdPXF" Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200103090349.f293nGs04577@billy-club.village.org>; from imp@village.org on Thu, Mar 08, 2001 at 08:49:16PM -0700 Sender: owner-freebsd-arch@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG --3MwIy2ne0vdjdPXF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Mar 08, 2001 at 08:49:16PM -0700, Warner Losh wrote: > Of course including bsd.cpu.mk and bsd.own.mk from sys.mk is likely > the wrong thing to do in the first place. It might be better to > search ${.CURDIR}, ${.CURDIR}/.., etc for etc/defaults/make.conf (note > no leading shash so it is relative to the dirs listed) and pull that > in. You'll eventually hit / in which case you pull in > /etc/defaults/make.conf. FreeBSD's etc/default/make.conf should be > modified to do the same search except looking for etc/make.conf. We > should have no etc/make.conf in the tree. People can edit that, or > put it in /etc/make.conf as they see fit. All that searching sounds like it would slow things down given the number of times make runs during a make world. On the other hand, recursively including parent Makefile.incs until there are no more parents, and then pulling in a config file also adds more work. That also is a bit funky in that /usr/src/etc/defaults/make.conf controls default settings for /usr/src, but it is also installed as /etc/defaults/make.conf and applies to all makes, so it still has global scope. Perhaps you meant to say ./src.conf.defaults or something (i.e. there would be a /usr/src/src.conf.defaults in the repo which has all of the NO_* crap currently in make.conf, etc., and you can overrride this for any subtree of /usr/src by sticking a src.conf there. Anyway, the only real question here is whether to go for the iterative .for search, or a recursive include. Both can give the same behaviour, so it comes down to which is more efficient. > Something like the following patch, included after my sig. Note, I'd > also go for nuking bsd.own.mk and bsd.cpu.mk and moving them into > etc/defaults/make.conf so we stop polluting the global make space with > them. .for loops are hard to terminate in make, so I didn't try. You can't put bsd.cpu.mk in /etc/defaults/make.conf or I would have done this from the beginning. It has to be included AFTER /etc/make.conf, because thats where CPUTYPE is set. Kris --3MwIy2ne0vdjdPXF Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.4 (FreeBSD) Comment: For info see http://www.gnupg.org iD8DBQE6qFieWry0BWjoQKURAupCAJsF/BtsTzQBU4njABJ9yd9F560xCwCgoZuD bMIo8OWBiiwGmHDWCVOWtCI= =gwBJ -----END PGP SIGNATURE----- --3MwIy2ne0vdjdPXF-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message