Re: checkflist fails...

[Kurt Schreiner <ks%ub.uni-mainz.de@localhost>]

On Fri, Jun 26, 2009 at 05:46:53AM +0200, Alistair Crooks wrote:
> On Thu, Jun 25, 2009 at 10:16:56PM +0200, Kurt Schreiner wrote:
> > Hi,
> > 
> > running build.sh ... distribution on amd64 with -current source
> > cvs update'd ca. Jun 25 22:06 MEST fails in checkflist:
> > 
> > checkflist ===> distrib/sets
> > [...]
> > nbmake: stopped in /u/NetBSD/src/distrib/sets
> > --- distribution ---
> > *** [distribution] Error code 2
> > 1 error
> > 
> > nbmake: stopped in /u/NetBSD/src
> 
> Sorry, should be fixed now (I actually ran through two build.sh runs,
> but I only committed part of the tree, and missed the set list
> changes).
Yep, i386 etc are ok now, but amd64 (and sparc64?) needs the following
patche/additional Makefile to get things going:

Patch:
Index: external/lib/Makefile
===================================================================
RCS file: /cvsroot/src/compat/external/lib/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- external/lib/Makefile       10 Jun 2009 12:48:06 -0000      1.8
+++ external/lib/Makefile       27 Jun 2009 21:21:21 -0000
@@ -20,5 +20,6 @@

 SUBDIR+= ../bsd/bind/lib
 SUBDIR+= ../bsd/file/lib
+SUBDIR+= ../bsd/iscsi/lib

 .include <bsd.subdir.mk>

New Makefile in (new dir) src/compat/external/bsd/iscsi/lib:

#       $NetBSD: Makefile,v 1.3 2009/04/14 17:33:27 christos Exp $

NOLINT= # defined
NOMAN=  # defined
NONLS=  # defined
NOINFO= # defined
NOSHARE=        # defined
LIBDPLIBS=      pthread  ${.CURDIR}/../../../../lib/libpthread

NOCHECKVER=     # defined

.include <bsd.obj.mk>

# Resolve pathnames in variables.
_RESOLVE_VARS=  CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR
.for var in ${_RESOLVE_VARS}
${var}:=        ${${var}}
.endfor

_CURDIR:= ${.CURDIR}

.PATH: ${NETBSDSRCDIR}/external/bsd/iscsi/lib
.CURDIR:=${NETBSDSRCDIR}/external/bsd/iscsi/lib

.include "${NETBSDSRCDIR}/compat/Makefile.compat"
.include "${.CURDIR}/Makefile"

# Resolve pathnames from "real" Makefile, and switch .CURDIR back.
_RESOLVE_VARS=  CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBC
DIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP
.for var in ${_RESOLVE_VARS}
${var}:=        ${${var}}
.endfor

.CURDIR:=       ${_CURDIR}
.undef          _CURDIR

At least build.sh ... distribution now finishs w/o complaints...
And src/compat/lib/libiscsi isn't needed anymore.

Kurt