From owner-freebsd-current Fri May 3 21: 9:49 2002 Delivered-To: freebsd-current@freebsd.org Received: from panzer.kdm.org (panzer.kdm.org [216.160.178.169]) by hub.freebsd.org (Postfix) with ESMTP id 6777337B417; Fri, 3 May 2002 21:09:36 -0700 (PDT) Received: (from ken@localhost) by panzer.kdm.org (8.11.6/8.9.1) id g4449Zc17740; Fri, 3 May 2002 22:09:35 -0600 (MDT) (envelope-from ken) Date: Fri, 3 May 2002 22:09:35 -0600 From: "Kenneth D. Merry" To: Ruslan Ermilov Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org, current@FreeBSD.org Subject: Re: cvs commit: src/share/mk bsd.doc.mk bsd.docb.mk bsd.info.mk bsd.init.mk bsd.lib.mk bsd.libnames.mk bsd.man.mk bsd.nls.mk bsd.obj.mk bsd.own.mk bsd.prog.mk bsd.sgml.mk bsd.subdir.mk sys.mk Message-ID: <20020503220935.A17720@panzer.kdm.org> References: <200204171349.g3HDnTV73622@freefall.freebsd.org> <20020503220004.A17421@panzer.kdm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <20020503220004.A17421@panzer.kdm.org>; from ken@kdm.org on Fri, May 03, 2002 at 10:00:05PM -0600 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, May 03, 2002 at 22:00:05 -0600, Kenneth D. Merry wrote: > On Wed, Apr 17, 2002 at 06:49:29 -0700, Ruslan Ermilov wrote: > > ru 2002/04/17 06:49:29 PDT > > > > Modified files: > > share/mk bsd.doc.mk bsd.docb.mk bsd.info.mk > > bsd.lib.mk bsd.libnames.mk bsd.man.mk > > bsd.nls.mk bsd.obj.mk bsd.own.mk > > bsd.prog.mk bsd.sgml.mk bsd.subdir.mk > > sys.mk > > Added files: > > share/mk bsd.init.mk > > Log: > > Don't include bsd.own.mk from sys.mk, this makes it impossible > > to use ``.if defined()'' inside bsd.own.mk to test for defines > > in individual makefiles. For example, setting DEBUG_FLAGS in > > Makefile didn't take the desired effect on the STRIP assignment. > > > > Added bsd.init.mk (like in NetBSD) that handles the inclusion > > of ../Makefile.inc and bsd.own.mk from all bsd.*.mk files that > > "build something". > > > > Back out bsd.own.mk,v 1.15: moved OBJFORMAT initialization back > > to sys.mk (several source tree makefiles want to check it early) > > and removed MACHINE_ARCH initialization (it's hard to see from > > looking at the commitlogs what the problem was at the time, but > > now it serves no purpose). > > > > Prohibit the direct inclusion of bsd.man.mk and bsd.libnames.mk. > > > > Protect bsd.obj.mk from repetitive inclusion. Prohibiting the > > direct inclusion of bsd.obj.mk might be a good idea too. > > This commit breaks building -current kernels on -stable. > > ============================================================================== > ===> 3dfx > "/usr/home/ken/perforce/FreeBSD-zero/src/sys/modules/3dfx/../../conf/kmod.mk", line 89: Could not find bsd.init.mk > make: fatal errors encountered -- cannot continue > *** Error code 1 > > Stop in /usr/home/ken/perforce/FreeBSD-zero/src/sys/modules. > *** Error code 1 > > Stop in /usr/home/ken/perforce/FreeBSD-zero/src/sys/i386/compile/gondolin. > > ============================================================================== > > The attached patch "fixes" it for me. > > I'm sure someone can come up with a cleaner way of fixing the problem. > > Ken > -- > Kenneth Merry > ken@kdm.org Sorry, it was this commit that broke building -current kernels on -stable: ru 2002/04/22 08:47:11 PDT Modified files: sys/conf kmod.mk Log: Use standard bsd.init.mk prologue. Revision Changes Path 1.116 +1 -7 src/sys/conf/kmod.mk > ==== //depot/FreeBSD-zero/src/sys/conf/kmod.mk#9 - /usr/home/ken/perforce/FreeBSD-zero/src/sys/conf/kmod.mk ==== > *** /tmp/tmp.18430.0 Fri May 3 21:51:56 2002 > --- /usr/home/ken/perforce/FreeBSD-zero/src/sys/conf/kmod.mk Fri May 3 21:51:43 2002 > *************** > *** 86,92 **** > --- 86,98 ---- > .error "Do not use KMODDEPS on 5.0+, use MODULE_VERSION/MODULE_DEPEND" > .endif > > + .if exists(____) > .include > + .elif exists(../../../share/mk/bsd.init.mk) > + .include "../../../share/mk/bsd.init.mk" > + .elif exists(../../../../share/mk/bsd.init.mk) > + .include "../../../../share/mk/bsd.init.mk" > + .endif > > .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S > Ken -- Kenneth Merry ken@kdm.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message