Subject: Re: building XEN0 kernel fails
To: None <current-users@netbsd.org>
From: Jukka Salmi <j+nbsd@2005.salmi.ch>
List: current-users
Date: 06/07/2005 14:46:32
--RASg3xLB4tUQ4RcS
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Teemu Rinta-aho --> current-users (2005-06-07 15:35:28 +0300):
> Is this going to stay broken or is someone going to fix it?

This was further discussed on [1]tech-toolchain, thread `arg list too long?'.
The attached patch (by Simon Gerraty) fixes the problem.


HTH, Jukka

[1] http://mail-index.netbsd.org/tech-toolchain/2005/06/

-- 
bashian roulette:
$ ((RANDOM%6)) || rm -rf ~

--RASg3xLB4tUQ4RcS
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="xen_begin.patch"

--- sys/arch/xen/conf/Makefile.xen.orig	2005-05-31 06:03:11.000000000 +0200
+++ sys/arch/xen/conf/Makefile.xen	2005-06-07 13:38:44.000000000 +0200
@@ -59,6 +59,7 @@
 vector.o: ${XEN}/${XEN_BUILD}/vector.S assym.h
 	${NORMAL_S}
 
+.ifndef noBEGIN
 .if !make(obj) && !make(clean) && !make(cleandir)
 .BEGIN:
 .for A in ${XEN_MACHINE_ARCHS}
@@ -69,6 +70,7 @@
 	mkdir xen-ma
 	ln -s ../${XEN_BUILD} xen-ma/machine
 .endif
+.endif
 
 ##
 ## (5) link settings
--- sys/conf/Makefile.kern.inc.orig	2005-06-02 07:11:55.000000000 +0200
+++ sys/conf/Makefile.kern.inc	2005-06-07 13:40:14.000000000 +0200
@@ -300,6 +300,7 @@
 _SFILES=${MD_SFILES} ${SFILES}
 _CFILES=${MD_CFILES} ${MI_CFILES} ${CFILES}
 _XargsMKDEP=${MKDEP:M*=*} xargs -t ${MKDEP:N*=*}
+_SubMake=${.MAKE} -f ${MAKEFILE} -DnoBEGIN
 
 # This dance is necessary to avoid long command lines.
 ${SRCS:S,^,list-,}:
@@ -311,8 +312,8 @@
 .depend: ${SRCS} assym.h config_time.h
 	${_MKTARGET_CREATE}
 	@> $@
-	@${.MAKE} -f ${MAKEFILE} _sfiles | ${_XargsMKDEP} -a -- ${MKDEP_AFLAGS} ${CPPFLAGS} 
-	@${.MAKE} -f ${MAKEFILE} _cfiles | ${_XargsMKDEP} -a -- ${MKDEP_CFLAGS} ${CPPFLAGS}
+	@${_SubMake} _sfiles | ${_XargsMKDEP} -a -- ${MKDEP_AFLAGS} ${CPPFLAGS}
+	@${_SubMake} _cfiles | ${_XargsMKDEP} -a -- ${MKDEP_CFLAGS} ${CPPFLAGS}
 	cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \
 	    ${GENASSYM} -- ${MKDEP} -f assym.dep -- \
 	    ${CFLAGS} ${CPPFLAGS}

--RASg3xLB4tUQ4RcS--