On Sun, May 05, 2002 at 10:05:18 +1000, Bruce Evans wrote:
> On Fri, 3 May 2002, Kenneth D. Merry wrote:
>
> > On Fri, May 03, 2002 at 22:00:05 -0600, Kenneth D. Merry wrote:
> > > The attached patch "fixes" it for me.
> > >
> > > I'm sure someone can come up with a cleaner way of fixing the problem.
>
> It doesn't seem to be very easy to fix. Kernel makefiles should not depend
> on anything outside of the kernel tree. Depending on bsd.kern.mk is bad
> enough.
>
> > 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(__<bsd.init.mk>__)
>
> It will never exist when it has 2 layers of misspelling like this :-).
I grabbed the __ part from bsd.init.mk, but I suppose I was a bit confused.
So if I do:
.if exists(<bsd.init.mk>)
with make(1) do the right thing?
> > > .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
> > >
>
> Not using it when it isn't in the standard place would be less ugly.
How about this? Assuming exists() does the right thing (does it?), this
patch would restore the previous behavior if bsd.init.mk isn't there.
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.6730.0 Sat May 4 18:49:30 2002
--- /usr/home/ken/perforce/FreeBSD-zero/src/sys/conf/kmod.mk Sat May 4 18:47:22
2002
***************
*** 86,92 ****
--- 86,99 ----
.error "Do not use KMODDEPS on 5.0+, use MODULE_VERSION/MODULE_DEPEND"
.endif
+ .if exists(<bsd.init.mk>)
.include <bsd.init.mk>
+ .elif !target(__initialized__)
+ __initialized__:
+ .if exists(${.CURDIR}/../Makefile.inc)
+ .include "${.CURDIR}/../Makefile.inc"
+ .endif
+ .endif
.SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
