From owner-freebsd-current@FreeBSD.ORG  Sun May 11 00:40:35 2003
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 66EAC37B401
	for <current@freebsd.org>; Sun, 11 May 2003 00:40:35 -0700 (PDT)
Received: from mailman.zeta.org.au (mailman.zeta.org.au [203.26.10.16])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 00D9343FD7
	for <current@freebsd.org>; Sun, 11 May 2003 00:40:34 -0700 (PDT)
	(envelope-from bde@zeta.org.au)
Received: from katana.zip.com.au (katana.zip.com.au [61.8.7.246])
	by mailman.zeta.org.au (8.9.3p2/8.8.7) with ESMTP id RAA27637;
	Sun, 11 May 2003 17:40:15 +1000
Date: Sun, 11 May 2003 17:40:14 +1000 (EST)
From: Bruce Evans <bde@zeta.org.au>
X-X-Sender: bde@gamplex.bde.org
To: Poul-Henning Kamp <phk@phk.freebsd.dk>
In-Reply-To: <40211.1052584093@critter.freebsd.dk>
Message-ID: <20030511170900.P74675@gamplex.bde.org>
References: <40211.1052584093@critter.freebsd.dk>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: current@freebsd.org
cc: Mark Murray <mark@grondar.org>
Subject: Re: buildworld b?rkedinlibpam 
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 May 2003 07:40:35 -0000

On Sat, 10 May 2003, Poul-Henning Kamp wrote:

> In message <200305101515.h4AFFU8c039592@grimreaper.grondar.org>, Mark Murray wr
> ites:
> >"Poul-Henning Kamp" writes:
> >> >> http://phk.freebsd.dk/misc/_.ia64.buildworld
> >> >
> >> >AHA!
> >> >
> >> >Please try this patch (you may need to do it manually because of c&p
> >> >fubaring):

[Context with patch lost]

> >> Started, report to follow...
> >
> >Thanks! :-)
> >
> >I'm very confident about this. If it works for all archs, I'd like to get
> >it into 5.1.
>
> Well, it didn't.  It failed for both ia64 and i386 so far :-(

The patch seems to fix one aspect of the problem.  It restores creation
of ${WORLDTMP}/usr/include/openssl/ in the loop that creates
${WORLDTMP}/usr/include/.  This cannot be a complete fix, since there
are many other subdirs of ${WORLDTMP}/usr/include/ that need to be created
before they are used.

The main problem seems to be that the _includes target needs to build at
least its second subdir (src/include) before the others, but it does the
opposite of this -- it uses par-includes to run "make includes" in the
subdirs concurrently.

Untested quick fix:

%%%
Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.356
diff -u -0 -r1.356 Makefile.inc1
--- Makefile.inc1	5 May 2003 12:54:26 -0000	1.356
+++ Makefile.inc1	11 May 2003 07:21:11 -0000
@@ -330 +404,1 @@
-	cd ${.CURDIR}; ${WMAKE} SHARED=symlinks par-includes
+	cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes
%%%

Bruce