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 [EMAIL PROTECTED]
==== //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(__<bsd.init.mk>__) .include <bsd.init.mk> + .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