From owner-freebsd-current Tue Dec 14 11:22:15 1999 Delivered-To: freebsd-current@freebsd.org Received: from alcanet.com.au (border.alcanet.com.au [203.62.196.10]) by hub.freebsd.org (Postfix) with ESMTP id 3E62615281 for ; Tue, 14 Dec 1999 11:22:08 -0800 (PST) (envelope-from jeremyp@gsmx07.alcatel.com.au) Received: by border.alcanet.com.au id <40325>; Wed, 15 Dec 1999 06:13:31 +1100 Content-return: prohibited Date: Wed, 15 Dec 1999 06:21:48 +1100 From: Peter Jeremy Subject: Re: make world broken building fortunes In-reply-to: <3854BF8C.ED803CBD@scc.nl>; from marcel@scc.nl on Mon, Dec 13, 1999 at 08:42:36PM +1100 To: Marcel Moolenaar Cc: freebsd-current@FreeBSD.ORG Message-Id: <99Dec15.061331est.40325@border.alcanet.com.au> MIME-version: 1.0 X-Mailer: Mutt 1.0i Content-type: text/plain; charset=us-ascii References: <99Dec13.132333est.40338@border.alcanet.com.au> <99Dec13.154631est.40324@border.alcanet.com.au> <3854BF8C.ED803CBD@scc.nl> Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On 1999-Dec-13 20:42:36 +1100, Marcel Moolenaar wrote: >Index: Makefile.inc1 >=================================================================== >RCS file: /home/ncvs/src/Makefile.inc1,v >retrieving revision 1.106 >diff -u -r1.106 Makefile.inc1 >--- Makefile.inc1 1999/12/12 22:24:08 1.106 >+++ Makefile.inc1 1999/12/13 09:40:16 >@@ -113,7 +113,7 @@ > OBJTREE= ${MAKEOBJDIRPREFIX}/${MACHINE_ARCH} > .endif > WORLDTMP= ${OBJTREE}${.CURDIR}/${BUILD_ARCH} >-STRICTTMPPATH= ${WORLDTMP}/bin:${WORLDTMP}/usr/bin >+STRICTTMPPATH= ${WORLDTMP}/bin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games > TMPPATH= ${STRICTTMPPATH}:${PATH} Taking into account Sheldon and Rodney's comments, together with another few glitches (casear is also needed to build the ROT-13 fortune database and my existing makeinfo wasn't up to building the gawk info files), I came up with the following: Index: src/Makefile.inc1 =================================================================== RCS file: /home/CVSROOT/src/Makefile.inc1,v retrieving revision 1.106 diff -u -r1.106 Makefile.inc1 --- Makefile.inc1 1999/12/12 22:24:08 1.106 +++ Makefile.inc1 1999/12/13 23:07:53 @@ -113,7 +113,14 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${MACHINE_ARCH} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/${BUILD_ARCH} +.if exists(${.CURDIR}/games) && !defined(NOGAMES) +# /usr/games is needed for strfile and caesar, both of which are +# required for building the fortune databases. +STRICTTMPPATH= ${WORLDTMP}/bin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games +.else STRICTTMPPATH= ${WORLDTMP}/bin:${WORLDTMP}/usr/bin +.endif + TMPPATH= ${STRICTTMPPATH}:${PATH} # bootstrap/tools make @@ -334,7 +341,8 @@ # tools - Build tools needed to run the actual build. # .if exists(${.CURDIR}/games) && !defined(NOGAMES) -_strfile= games/fortune/strfile +# strfile and caesar are needed to build the fortune database +_strfile= games/fortune/strfile games/caesar .endif .if ${MACHINE_ARCH} == "i386" && ${MACHINE} == "pc98" @@ -344,7 +352,7 @@ tools:: .for _tool in ${_strfile} ${_aout_tools} usr.bin/gensetdefs \ gnu/usr.bin/binutils usr.bin/objformat usr.bin/yacc usr.bin/colldef \ - gnu/usr.bin/bison gnu/usr.bin/cc + gnu/usr.bin/bison gnu/usr.bin/cc gnu/usr.bin/texinfo cd ${.CURDIR}/${_tool}; \ ${MAKE} obj; \ ${MAKE} depend; \ Index: src/games/fortune/datfiles/Makefile =================================================================== RCS file: /home/CVSROOT/src/games/fortune/datfiles/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- Makefile 1999/11/05 08:17:53 1.23 +++ Makefile 1999/12/13 20:00:49 @@ -33,16 +33,13 @@ .for f in fortunes fortunes2 fortunes2-o limerick startrek zippy $f.dat: $f - PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \ strfile -Crs ${.ALLSRC} ${.TARGET} .endfor fortunes-o.dat: fortunes-o - PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \ strfile -Crsx ${.ALLSRC} ${.TARGET} fortunes-o: fortunes-o.${TYPE} - PATH=$$PATH:/usr/games:${.OBJDIR}/../../caesar \ caesar 13 < ${.ALLSRC} > ${.TARGET} .include I can now successfully do a -CURRENT buildworld on a system running -CURRENT before the signal changes. Peter To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message