[Redirected to -stable]

Gavin,

The attached patch makes it possible to upgrade the 4.1-RELEASE
box to the 4.4-STABLE.

David,

I would also like to commit the following patch to -CURRENT, to
align binutils/libiberty/Makefile with the attached patch.

Index: Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/binutils/libiberty/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile    2001/09/14 23:07:02     1.11
+++ Makefile    2001/09/25 12:25:43
@@ -10,8 +10,7 @@ SRCS= argv.c choose-temp.c concat.c cp-d
        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

The reason why the ar(1) check may be bad is that the version in libc
may be bad as well.  See log for revision 1.2 of libc/gen/basename.c
for an example, having in mind that /usr/lib/libc.a has version 1.1.

On Tue, Sep 25, 2001 at 12:05:42PM +0100, Gavin Kenny wrote:
> Hi all,
> 
> having updated my source I have run make buildworld
> and it is exiting with Error code 1 and 2.
> 
> The last line before the error codes is:
> 
> eelf_i386.o: In function
> `gldelf_i386_open_dynamic_archive':
> 
> eelf_i386.o(.text+0xc7b): undefined reference to
> `basename'
> 
> ***Error code 1
> 1 error
> 
> ***Error code 2
> 1 error
> 
> this line repeates 3 more times
> 
> Any ideas what the problem is and how to fix it?
> 
> Many thanks

-- 
Ruslan Ermilov          Oracle Developer/DBA,
[EMAIL PROTECTED]           Sunbay Software AG,
[EMAIL PROTECTED]          FreeBSD committer,
+380.652.512.251        Simferopol, Ukraine

http://www.FreeBSD.org  The Power To Serve
http://www.oracle.com   Enabling The Information Age
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/gnu/usr.bin/binutils/libiberty/Makefile,v
retrieving revision 1.3.2.3
diff -u -p -r1.3.2.3 Makefile
--- Makefile    2001/08/01 22:54:12     1.3.2.3
+++ Makefile    2001/09/25 12:23:37
@@ -10,6 +10,9 @@ SRCS= argv.c choose-temp.c concat.c cp-d
        hex.c floatformat.c lbasename.c objalloc.c obstack.c safe-ctype.c \
        xatexit.c xexit.c xmalloc.c \
        xstrdup.c xstrerror.c
+.if defined(BOOTSTRAPPING)
+SRCS+= basename.c
+.endif
 CFLAGS+=       -DHAVE_CONFIG_H
 NOPROFILE=     true
 NOPIC=         true

Reply via email to