Date: Mon, 17 Sep 2001 15:59:42 +0300 From: Ruslan Ermilov <ru@FreeBSD.ORG> To: "David O'Brien" <obrien@FreeBSD.ORG> Cc: freebsd-current@FreeBSD.ORG Subject: Re: Buildworld problems Message-ID: <20010917155942.J74429@sunbay.com> In-Reply-To: <20010914160801.A8668@dragon.nuxi.com>; from obrien@FreeBSD.ORG on Fri, Sep 14, 2001 at 04:08:01PM -0700 References: <20010914100423.M93244-100000@fw.mccons.net> <20010914183309.A52001@sunbay.com> <20010914160801.A8668@dragon.nuxi.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Sep 14, 2001 at 04:08:01PM -0700, David O'Brien wrote:
> On Fri, Sep 14, 2001 at 06:33:09PM +0300, Ruslan Ermilov wrote:
> > Please try the attached patch. I'm going to attempt to unbreak
> > the upgrade path from 4.1-RELEASE to 5.0-CURRENT sometimes in
> > the near future.
>
> Please try to restructure it along the lines of
> src/gnu/usr.bin/binutils/libiberty/Makefile rev 1.11. Peter provided a
> patch that is a more proper way.
>
Nope, you please try to restructure it along the lines of
src/usr.bin/xinstall/Makefile rev 1.16. Also, won't it be
better to use the libc version of basename.c?
(I've added -DBOOTSTRAPPING in src/Makefile.inc1,v 1.216.)
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/binutils/libiberty/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 2001/09/14 23:07:02 1.11
+++ Makefile 2001/09/17 12:18:36
@@ -2,6 +2,9 @@
.include "../Makefile.inc0"
+.if defined(BOOTSTRAPPING)
+.PATH: ${.CURDIR}/../../../../lib/libc/gen
+.endif
.PATH: ${SRCDIR}/libiberty
LIB= iberty
@@ -10,8 +13,7 @@
hex.c floatformat.c lbasename.c objalloc.c obstack.c safe-ctype.c \
xatexit.c xexit.c xmalloc.c \
xstrdup.c xstrerror.c
-LIBC_BASENAME!= ar tv /usr/lib/libc.a | grep basename
-.if ${LIBC_BASENAME} == ""
+.if defined(BOOTSTRAPPING)
SRCS+= basename.c
.endif
CFLAGS+= -DHAVE_CONFIG_H
Cheers,
--
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
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010917155942.J74429>