From owner-freebsd-current@FreeBSD.ORG Thu Aug 12 07:19:31 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0FC4416A4CE; Thu, 12 Aug 2004 07:19:31 +0000 (GMT) Received: from n33.kp.t-systems-sfr.com (n33.kp.t-systems-sfr.com [129.247.16.33]) by mx1.FreeBSD.org (Postfix) with ESMTP id CECEE43D41; Thu, 12 Aug 2004 07:19:29 +0000 (GMT) (envelope-from harti@freebsd.org) Received: from n81.sp.op.dlr.de (n81g.sp.op.dlr.de [129.247.163.1]) i7C7JFX496118; Thu, 12 Aug 2004 09:19:15 +0200 Received: from zeus.nt.op.dlr.de (zeus.nt.op.dlr.de [129.247.173.3]) i7C7JDf562386; Thu, 12 Aug 2004 09:19:14 +0200 Received: from beagle.kn.op.dlr.de (opkndnwsbsd178 [129.247.173.178]) by zeus.nt.op.dlr.de (8.11.7+Sun/8.9.1) with ESMTP id i7C7JCe05882; Thu, 12 Aug 2004 09:19:12 +0200 (MET DST) Date: Thu, 12 Aug 2004 09:19:12 +0200 (CEST) From: Harti Brandt X-X-Sender: brandt@beagle.kn.op.dlr.de To: "M. Warner Losh" In-Reply-To: <20040811.162640.00482545.imp@bsdimp.com> Message-ID: <20040812091334.F25699@beagle.kn.op.dlr.de> References: <20040810231044.GA70020@xor.obsecurity.org> <20040811.160420.34008155.imp@bsdimp.com> <20040811221348.GB93983@ip.net.ua> <20040811.162640.00482545.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: current@freebsd.org cc: kris@obsecurity.org Subject: Re: World broken in stage 1.1 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Harti Brandt List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Aug 2004 07:19:31 -0000 On Wed, 11 Aug 2004, M. Warner Losh wrote: MWL>In message: <20040811221348.GB93983@ip.net.ua> MWL> Ruslan Ermilov writes: MWL>: On Wed, Aug 11, 2004 at 04:04:20PM -0600, M. Warner Losh wrote: MWL>: > In message: <20040810231044.GA70020@xor.obsecurity.org> MWL>: > Kris Kennaway writes: MWL>: > : More fallout from the wonderful new make(1) semantics? MWL>: > MWL>: > I think it is speficially related to the changes to src/Makefile and MWL>: > src/Makefile.inc1. If I s/${_+_}//g on those two files, it appears MWL>: > that I can buildworld again (at least it doesn't die right away). MWL>: > MWL>: How exactly does it die for you, please provide some logs. MWL> MWL>The problem is due to the following in share/mk/sys.mk: MWL> MWL>.if !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n" MWL>_+_ ?= MWL>.else MWL>_+_ ?= + MWL>.endif MWL> MWL>This should have a third clause: MWL> MWL>.if ${MAKE_VERSION} >= 5200408030 && !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n" MWL> MWL>so that _+_ is defined to be nothing for those versions of make that MWL>don't yet support this new feature of posix. That should just 'not happen'. There has been one problem here: a bug in crunchgen emitting a line causing the wrong make to be used. This should not and was not fixed by causing the new .mk files to be usable with the old make but causing the right make to use in rescue. Otherwise you should obviously not forcibly use the old make with new .mk scripts or the other way around. The makefiles are usually smart enough to use either the new make and the new .mk files or the old, installed make and the old, installed .mk scripts. Any mismatch is either cause by a bug somewhere (as in the case of crunchgen) or forced by the user. harti