Re: 5.1-RELEASE-p2 buildworld crash - help!!

On Thu, 4 Sep 2003 18:58:42 +0300
ODHIAMBO Washington <wash_at_wananchi.com> wrote:

> This is what Ruslan said of the problem. However, I must admit that
> I haven't done anything about it since I did not quite understand
> what it is he meant I should do ;)
> 
> Quoting him verbatim:
> 
> 
> > I've tracked it down to the same problem we were having ealier
> > with the libpthread build.  You can either merge the following
> > revisions manually, or wait for an official fix to pop up in
> > RELENG_5_1:
> > 
> > Makefile.inc1: 1.365, 1.367
> > lib/libpthread/support/Makefile.inc: 1.2
> 
> 
> TIA
> 
> 
> -Wash
> 
> -- 
> Odhiambo Washington   <wash_at_wananchi.com>  "The box said 'Requires
> Wananchi Online Ltd.  www.wananchi.com      Windows 95, NT, or better,'
> Tel: +254 2 313985-9  +254 2 313922         so I installed FreeBSD."   
> GSM: +254 72 743223   +254 733 744121       This sig is McQ!  :-)
> 
> Don't believe everything you hear or anything you say.
> 


There are the patches:


diff -u /usr/src/Makefile.inc1.orig /usr/src/Makefile.inc1
#--------------------------------------------------------------------------------------
--- /usr/src/Makefile.inc1.orig	Fri Sep  5 02:11:23 2003
+++ /usr/src/Makefile.inc1	Fri Sep  5 00:47:07 2003
_at__at_ -791,6 +791,10 _at__at_
 _generic_libs+=	kerberos5/lib
 .endif
 
+.if !defined(NOLIBPTHREAD)
+_prebuild_libs+= lib/libc
+.endif
+	 
 _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \
 		lib/libkvm lib/libmd \
 		lib/libncurses lib/libopie lib/libpam lib/libradius \
#--------------------------------------------------------------------------------------


diff -u  /usr/src/lib/libpthread/support/Makefile.inc.orig /usr/src/lib/libpthread/support/Makefile.inc
#--------------------------------------------------------------------------------------
--- /usr/src/lib/libpthread/support/Makefile.inc.orig	Fri Sep  5 02:13:29 2003
+++ /usr/src/lib/libpthread/support/Makefile.inc	Fri Sep  5 00:48:10 2003
_at__at_ -6,5 +6,5 _at__at_
 SOBJS+= thr_libc.So
 
 thr_libc.So: thr_support.So
-	${CC} -nostdlib -L/usr/lib -o ${.TARGET} -Wl,-x,-r ${.ALLSRC} -lc_pic
+	${CC} -nostdlib -o ${.TARGET} -Wl,-x,-r ${.ALLSRC} -lc_pic
#--------------------------------------------------------------------------------------

They resolved the problem of buildworld 5.1-RELEASE-p2 on 4.8-RELEASE-p4.