From owner-freebsd-current Sat Dec 8 13: 8:35 2001 Delivered-To: freebsd-current@freebsd.org Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by hub.freebsd.org (Postfix) with ESMTP id B9F2F37B405 for ; Sat, 8 Dec 2001 13:08:32 -0800 (PST) Received: from peter3.wemm.org ([12.232.27.13]) by rwcrmhc51.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20011208210823.FEHF5859.rwcrmhc51.attbi.com@peter3.wemm.org> for ; Sat, 8 Dec 2001 21:08:23 +0000 Received: from overcee.netplex.com.au (overcee.wemm.org [10.0.0.3]) by peter3.wemm.org (8.11.0/8.11.0) with ESMTP id fB8L8Ws27664 for ; Sat, 8 Dec 2001 13:08:32 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.netplex.com.au (Postfix) with ESMTP id 2FC593808; Sat, 8 Dec 2001 13:08:32 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Mathieu Arnold Cc: Warner Losh , current@FreeBSD.ORG Subject: Re: stable->current busted In-Reply-To: <3C106394.A9803F72@club-internet.fr> Date: Sat, 08 Dec 2001 13:08:32 -0800 From: Peter Wemm Message-Id: <20011208210832.2FC593808@overcee.netplex.com.au> Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Mathieu Arnold wrote: > > Warner Losh wrote: > > > > 4.4-r -> current build is very broken right now. I'll investigate and > > fix. > > last time I did it, I had a problem with install, adding LDFLAGS+= > -static to src/usr.bin/xinstall/Makefile fixed the problem. > the problem was using install linked to libc.so.4 to do something like > this : > rm libc.so.4 > install libc.so.4 > which was failing for obvious reasons :) I think this will fix it: http://people.freebsd.org/~peter/compat.diff I would have liked to change the 'beforeinstall' to 'afterinstall' in Makefile.inc, but afterinstall seems to not be usable. Another option is this: Index: Makefile.inc =================================================================== RCS file: /home/ncvs/src/lib/compat/Makefile.inc,v retrieving revision 1.8 diff -u -r1.8 Makefile.inc --- Makefile.inc 22 Sep 2001 08:11:24 -0000 1.8 +++ Makefile.inc 8 Dec 2001 21:04:42 -0000 @@ -3,7 +3,7 @@ LIBCOMPATDIR?= ${LIBDIR}/compat/aout .if defined(LIBS) && !empty(LIBS) -beforeinstall: __remove-stale-libs +maninstall:: __remove-stale-libs __remove-stale-libs: .PHONY .for lib in ${LIBS} .if exists(${DESTDIR}${SHLIBDIR}/${lib}) .. but if there was ever any abuse of bsd.*.mk in our tree, this would be it. It hooks onto the manpage install hook so that it can remove the old libraries *after* the compat libraries are installed. I think the first one is cleaner though. It moves the 4.x libraries to / usr/lib/compat first, then attempts to install new ones over the top. If something goes wrong trying to install the new ones, at least the old libraries will still be in /usr/lib/compat. Cheers, -Peter -- Peter Wemm - peter@FreeBSD.org; peter@yahoo-inc.com; peter@netplex.com.au "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message