From owner-freebsd-stable Thu Sep 6 10:34: 5 2001
Delivered-To: freebsd-stable@freebsd.org
Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65])
by hub.freebsd.org (Postfix) with ESMTP id 3038137B405
for <stable@FreeBSD.org>; Thu, 6 Sep 2001 10:33:43 -0700 (PDT)
Received: (from ru@localhost)
by whale.sunbay.crimea.ua (8.11.2/8.11.2) id f86HXGl70795;
Thu, 6 Sep 2001 20:33:16 +0300 (EEST)
(envelope-from ru)
Date: Thu, 6 Sep 2001 20:33:16 +0300
From: Ruslan Ermilov <ru@FreeBSD.org>
To: John Sijstermans <johnsijs@cuci.nl>
Cc: stable@FreeBSD.org
Subject: Upgrade path breakage from 4.0 to 4.x in usr.bin/xinstall (was: Re: make buildworld)
Message-ID: <20010906203316.B69166@sunbay.com>
References: <01090619141700.04995@jhgs>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="yrj/dFKFPuw6o+aM"
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <01090619141700.04995@jhgs>; from johnsijs@cuci.nl on Thu, Sep 06, 2001 at 07:11:57PM +0200
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG
--yrj/dFKFPuw6o+aM
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Please try the attached patch to src/usr.bin/xinstall/Makefile.
Perhaps, a similar patch will be needed for some other tools
used during {build,install}world, like mtree(8).
On Thu, Sep 06, 2001 at 07:11:57PM +0200, John Sijstermans wrote:
> After updating from 4.0-RELEASE to the most current 4.x-STABLE and following
> the instructions in /usr/src/UPDATING, "make buildworld" outputs the following
> error. I haven't the slightest idea what's going on here.
> Can anybody help?
>
>
> --------------------------------------------------------------
> >>> Rebuilding the temporary build tree
> --------------------------------------------------------------
> rm -rf
> /usr/obj/usr/src/i386 mkdir -p /usr/obj/usr/src/i386/usr/bin
> mkdir -p /usr/obj/usr/src/i386/usr/lib/compat/aout
> ..
> ..
> ..
> ..
> ..
> ln -sf /usr/src/sys /usr/obj/usr/src/i386
>
> --------------------------------------------------------------
> >>> stage 1: bootstrap tools
> --------------------------------------------------------------
> cd /usr/src; MAKEOBJDIRPREFIX=/usr/obj/usr/src/i386 DESTDIR=/usr/obj/usr/src/i386 INSTALL="sh /usr/src/tools/install.sh" MACHINE_ARCH=i386 TOOLS_PREFIX=/usr/obj/usr/src/i386 PATH=/usr/obj/usr/src/i386/usr/sbin:/usr/obj/usr/src/i386/usr/bin:/usr/obj/usr/src/i386/usr/games:/sbin:/bin:/usr/sbin:/usr/bin make -f Makefile.inc1 -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED bootstrap-tools
> cd /usr/src/games/fortune/strfile; make obj; make depend; make all; make install
> /usr/obj/usr/src/i386/usr/src/games/fortune/strfile created for /usr/src/games/fortune/strfile
> rm -f .depend
> mkdep -f .depend -a -I/usr/obj/usr/src/i386/usr/include /usr/src/games/fortune/strfile/strfile.c
> cd /usr/src/games/fortune/strfile; make _EXTRADEPEND
> echo strfile: /usr/obj/usr/src/i386/usr/lib/libc.a >> .depend
> cc -O -pipe -Wall -I/usr/obj/usr/src/i386/usr/include -c /usr/src/games/fortune/strfile/strfile.c
> cc -O -pipe -Wall -I/usr/obj/usr/src/i386/usr/include -static -o strfile strfile.o
> sh /usr/src/tools/install.sh -c -s -o root -g games -m 555 strfile /usr/obj/usr/src/i386/usr/games
> cd /usr/src/usr.bin/yacc; make obj; make depend; make all; make install
> /usr/obj/usr/src/i386/usr/src/usr.bin/yacc created for /usr/src/usr.bin/yacc
> rm -f .depend
> mkdep -f .depend -a -I/usr/obj/usr/src/i386/usr/include /usr/src/usr.bin/yacc/closure.c /usr/src/usr.bin/yacc/error.c /usr/src/usr.bin/yacc/lalr.c /usr/src/usr.bin/yacc/lr0.c /usr/src/usr.bin/yacc/main.c /usr/src/usr.bin/yacc/mkpar.c /usr/src/usr.bin/yacc/output.c /usr/src/usr.bin/yacc/reader.c /usr/src/usr.bin/yacc/skeleton.c /usr/src/usr.bin/yacc/symtab.c /usr/src/usr.bin/yacc/verbose.c /usr/src/usr.bin/yacc/warshall.c
> cd /usr/src/usr.bin/yacc; make _EXTRADEPEND
> echo yacc: /usr/obj/usr/src/i386/usr/lib/libc.a >> .depend
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/yacc/closure.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/yacc/error.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/yacc/lalr.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/yacc/lr0.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/yacc/main.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/yacc/mkpar.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/yacc/output.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/yacc/reader.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/yacc/skeleton.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/yacc/symtab.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/yacc/verbose.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/yacc/warshall.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -static -o yacc closure.o error.o lalr.o lr0.o main.o mkpar.o output.o reader.o skeleton.o symtab.o verbose.o warshall.o
> sh /usr/src/tools/install.sh -c -o root -g wheel -m 555 /usr/src/usr.bin/yacc/yyfix.sh /usr/obj/usr/src/i386/usr/bin/yyfix
> sh /usr/src/tools/install.sh -c -s -o root -g wheel -m 555 yacc /usr/obj/usr/src/i386/usr/bin
> /usr/obj/usr/src/i386/usr/bin/byacc -> /usr/obj/usr/src/i386/usr/bin/yacc
> cd /usr/src/usr.bin/colldef; make obj; make depend; make all; make install
> /usr/obj/usr/src/i386/usr/src/usr.bin/colldef created for /usr/src/usr.bin/colldef
> yacc -d /usr/src/usr.bin/colldef/parse.y
> cp y.tab.c parse.c
> lex -t -8 -i /usr/src/usr.bin/colldef/scan.l > scan.c
> rm -f .depend
> mkdep -f .depend -a -I. -I/usr/src/usr.bin/colldef/../../lib/libc/locale -DCOLLATE_DEBUG -I/usr/obj/usr/src/i386/usr/include parse.c scan.c
> cd /usr/src/usr.bin/colldef; make _EXTRADEPEND
> echo colldef: /usr/obj/usr/src/i386/usr/lib/libc.a /usr/obj/usr/src/i386/usr/lib/libl.a >> .depend
> cc -O -pipe -Wall -I. -I/usr/src/usr.bin/colldef/../../lib/libc/locale -DCOLLATE_DEBUG -I/usr/obj/usr/src/i386/usr/include -c parse.c
> cc -O -pipe -Wall -I. -I/usr/src/usr.bin/colldef/../../lib/libc/locale -DCOLLATE_DEBUG -I/usr/obj/usr/src/i386/usr/include -c scan.c
> /usr/src/usr.bin/colldef/scan.l:638: warning: `yyunput' defined but not used
> cc -O -pipe -Wall -I. -I/usr/src/usr.bin/colldef/../../lib/libc/locale -DCOLLATE_DEBUG -I/usr/obj/usr/src/i386/usr/include -static -o colldef parse.o scan.o -ll
> sh /usr/src/tools/install.sh -c -s -o root -g wheel -m 555 colldef /usr/obj/usr/src/i386/usr/bin
> cd /usr/src/usr.bin/xinstall; make obj; make depend; make all; make install
> /usr/obj/usr/src/i386/usr/src/usr.bin/xinstall created for /usr/src/usr.bin/xinstall
> rm -f .depend
> mkdep -f .depend -a -I/usr/obj/usr/src/i386/usr/include /usr/src/usr.bin/xinstall/xinstall.c
> cd /usr/src/usr.bin/xinstall; make _EXTRADEPEND
> echo xinstall: /usr/obj/usr/src/i386/usr/lib/libc.a >> .depend
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -c /usr/src/usr.bin/xinstall/xinstall.c
> cc -O -pipe -I/usr/obj/usr/src/i386/usr/include -static -o xinstall xinstall.o
> xinstall.o: In function `main':
> xinstall.o(.text+0x8f): undefined reference to `strtofflags'
> *** Error code 1
>
> Stop in /usr/src/usr.bin/xinstall.
> *** Error code 1
--
Ruslan Ermilov Oracle Developer/DBA,
ru@sunbay.com Sunbay Software AG,
ru@FreeBSD.org FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
--yrj/dFKFPuw6o+aM
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=p
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/xinstall/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 2001/04/02 11:54:59 1.15
+++ Makefile 2001/09/06 17:31:26
@@ -3,6 +3,22 @@
PROG= xinstall
PROGNAME= install
+SRCS= xinstall.c
MAN= install.1
+
+# Get __FreeBSD_version
+.if !defined(OSVERSION)
+.if exists(/sbin/sysctl)
+OSVERSION!= /sbin/sysctl -n kern.osreldate
+.else
+OSVERSION!= /usr/sbin/sysctl -n kern.osreldate
+.endif
+.endif
+
+.if ${OSVERSION} < 400021 || \
+ ${OSVERSION} >= 500000 && ${OSVERSION} < 500007
+.PATH: ${.CURDIR}/../../lib/libc/gen
+SRCS+= strtofflags.c
+.endif
.include <bsd.prog.mk>
--yrj/dFKFPuw6o+aM--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message