Re: Build under FreeBSD-STABLE broken?

[qhwt@xxxxxxxxxxxxx]

On Tue, Aug 19, 2003 at 03:46:40PM +0900, qhwt@xxxxxxxxxxxxx wrote:
> On Mon, Aug 18, 2003 at 09:34:27AM -0700, Matthew Dillon wrote:
> >     I'm just not sure where.   It may be that the kernel is not being
> >     built in /usr/obj where you thought it was being built and it is 
> >     working with an old Makefile?
> > 
> 
> OK, I've found it! After the source tree is restructured, some of the
> subdirectories went into a depth that bsd.kmod.mk didn't look into
> to find SYSDIR.
>   ${.CURDIR}/..              from sys/crypto/Makefile
>   ${.CURDIR}/../../../../..  from sys/dev/disk/aic7xxx/aic_eisa/Makefile
> 
> This might catch wrong subdirectories, so I'm not sure this is a fix,
> but it went further, at least to the same point where I replaced 4-STABLE
> source tree with DragonflyBSD source tree.
> 
> ------------------------ cut here ------------------------ 
> 
> Index: share/mk/bsd.kmod.mk
> ===================================================================
> RCS file: /home/source/dragonfly/cvs/src/share/mk/bsd.kmod.mk,v
> retrieving revision 1.2
> diff -u -u -r1.2 bsd.kmod.mk
> --- share/mk/bsd.kmod.mk	17 Jun 2003 04:37:02 -0000	1.2
> +++ share/mk/bsd.kmod.mk	19 Aug 2003 06:27:36 -0000
> @@ -2,7 +2,7 @@
>  # $DragonFly: src/share/mk/bsd.kmod.mk,v 1.2 2003/06/17 04:37:02 dillon Exp $
>  
>  # Search for kernel source tree in standard places.
> -.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. /sys /usr/src/sys
> +.for _dir in ${.CURDIR}/.. ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. ${.CURDIR}/../../../../.. /sys /usr/src/sys
>  .if !defined(SYSDIR) && exists(${_dir}/conf/kmod.mk)
>  SYSDIR=	${_dir}
>  .endif
> 
> ------------------------ cut here ------------------------ 
> 
> ===> emulation/svr4

And here's one more patch to emulation/svr4/Makefile. With these
two patches, buildkernel finished successfully. Glad if someone
try these and they don't break your buildkenrel.

Regards.

Index: sys/emulation/svr4/Makefile
===================================================================
RCS file: /home/source/dragonfly/cvs/src/sys/emulation/svr4/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sys/emulation/svr4/Makefile	15 Aug 2003 06:32:56 -0000	1.5
+++ sys/emulation/svr4/Makefile	19 Aug 2003 07:10:52 -0000
@@ -9,13 +9,13 @@
 #
 sysent:	${.CURDIR}/svr4_sysent.c
 
-${.CURDIR}/svr4_sysent.c ${.CURDIR}/svr4_syscall.h ${.CURDIR}/svr4_proto.h ${.CURDIR}/svr4_union.h: ${.CURDIR}/../../kern/makesyscalls.sh \
-		${.CURDIR}/syscalls.master ${.CURDIR}/syscalls.conf
-	-mv -f ${.CURDIR}/svr4_sysent.c ${.CURDIR}/svr4_sysent.c.bak
-	-mv -f ${.CURDIR}/svr4_syscall.h ${.CURDIR}/svr4_syscall.h.bak
-	-mv -f ${.CURDIR}/svr4_proto.h ${.CURDIR}/svr4_proto.h.bak
-	-mv -f ${.CURDIR}/svr4_union.h ${.CURDIR}/svr4_union.h.bak
-	cd ${.CURDIR} && sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
+${.OBJDIR}/svr4_sysent.c ${.OBJDIR}/svr4_syscall.h ${.OBJDIR}/svr4_proto.h ${.OBJDIR}/svr4_union.h: ${.OBJDIR}/../../kern/makesyscalls.sh \
+		${.OBJDIR}/syscalls.master ${.OBJDIR}/syscalls.conf
+	-mv -f ${.OBJDIR}/svr4_sysent.c ${.OBJDIR}/svr4_sysent.c.bak
+	-mv -f ${.OBJDIR}/svr4_syscall.h ${.OBJDIR}/svr4_syscall.h.bak
+	-mv -f ${.OBJDIR}/svr4_proto.h ${.OBJDIR}/svr4_proto.h.bak
+	-mv -f ${.OBJDIR}/svr4_union.h ${.OBJDIR}/svr4_union.h.bak
+	cd ${.OBJDIR} && sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf
 
 # This builds the module
 #