patches/binutils/2.18.50.0.7/110-ld-makefile-path.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
changeset 1602 1ba79f2126df
parent 506 ac951c5d22cb
permissions -rw-r--r--
libc/uClibc: fix building on system with recent glibc

While trying to build a toolchain with ct-ng 1.5.0,
arm-unknown-linux-uclibcgnueabi target,
I get the following error:

[INFO ] Installing C library headers
[EXTRA] Copying sources to build dir
[EXTRA] Applying configuration
[EXTRA] Building headers
[EXTRA] Installing headers
[ERROR] extra/scripts/unifdef.c:209: error: conflicting types for 'getline'
[ERROR] make[2]: *** [extra/scripts/unifdef] Error 1
[ERROR] Build failed in step 'Installing C library headers'

The following patch solves the problem.
(It's a backport of this uClibc commit:
http://git.uclibc.org/uClibc/commit/?id=49e81cada73616864b9b31df0aeb6961c30f5a6e
)

[--SNIP from another mail--]
AFAIK this is a problem since glibc 2.10.
     1 Fix ld scripts path, copied from buildroot.
     2 
     3  binutils-2.18.50.0.6/ld/Makefile.am |    2     1     1     0 +-
     4  binutils-2.18.50.0.6/ld/Makefile.in |    2     1     1     0 +-
     5  2 files changed, 2 insertions(+), 2 deletions(-)
     6 
     7 diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.am binutils-2.18.50.0.6/ld/Makefile.am
     8 --- binutils-2.18.50.0.6.orig/ld/Makefile.am	2008-04-03 18:54:05.000000000 +0200
     9 +++ binutils-2.18.50.0.6/ld/Makefile.am	2008-05-02 23:25:14.000000000 +0200
    10 @@ -18,7 +18,7 @@
    11  # We put the scripts in the directory $(scriptdir)/ldscripts.
    12  # We can't put the scripts in $(datadir) because the SEARCH_DIR
    13  # directives need to be different for native and cross linkers.
    14 -scriptdir = $(tooldir)/lib
    15 +scriptdir = $(libdir)
    16  
    17  EMUL = @EMUL@
    18  EMULATION_OFILES = @EMULATION_OFILES@
    19 diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.in binutils-2.18.50.0.6/ld/Makefile.in
    20 --- binutils-2.18.50.0.6.orig/ld/Makefile.in	2008-04-03 18:54:05.000000000 +0200
    21 +++ binutils-2.18.50.0.6/ld/Makefile.in	2008-05-02 23:25:14.000000000 +0200
    22 @@ -288,7 +288,7 @@
    23  # We put the scripts in the directory $(scriptdir)/ldscripts.
    24  # We can't put the scripts in $(datadir) because the SEARCH_DIR
    25  # directives need to be different for native and cross linkers.
    26 -scriptdir = $(tooldir)/lib
    27 +scriptdir = $(libdir)
    28  BASEDIR = $(srcdir)/..
    29  BFDDIR = $(BASEDIR)/bfd
    30  INCDIR = $(BASEDIR)/include