patches/binutils/2.18.50.0.4/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 747 d3e603e7c17c
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.
yann@1241
     1
Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch
yann@1241
     2
yann@1241
     3
-= BEGIN original header =-
yann@475
     4
Fix ld scripts path, copied from buildroot.
yann@475
     5
yann@475
     6
 binutils-2.18.50.0.6/ld/Makefile.am |    2     1     1     0 +-
yann@475
     7
 binutils-2.18.50.0.6/ld/Makefile.in |    2     1     1     0 +-
yann@475
     8
 2 files changed, 2 insertions(+), 2 deletions(-)
yann@475
     9
yann@1241
    10
-= END original header =-
yann@1241
    11
yann@1241
    12
diff -durN binutils-2.18.50.0.4.orig/ld/Makefile.am binutils-2.18.50.0.4/ld/Makefile.am
yann@1241
    13
--- binutils-2.18.50.0.4.orig/ld/Makefile.am	2007-11-03 21:40:37.000000000 +0100
yann@1241
    14
+++ binutils-2.18.50.0.4/ld/Makefile.am	2009-03-07 12:17:30.000000000 +0100
yann@475
    15
@@ -18,7 +18,7 @@
yann@475
    16
 # We put the scripts in the directory $(scriptdir)/ldscripts.
yann@475
    17
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
yann@475
    18
 # directives need to be different for native and cross linkers.
yann@475
    19
-scriptdir = $(tooldir)/lib
yann@475
    20
+scriptdir = $(libdir)
yann@475
    21
 
yann@475
    22
 EMUL = @EMUL@
yann@475
    23
 EMULATION_OFILES = @EMULATION_OFILES@
yann@1241
    24
diff -durN binutils-2.18.50.0.4.orig/ld/Makefile.in binutils-2.18.50.0.4/ld/Makefile.in
yann@1241
    25
--- binutils-2.18.50.0.4.orig/ld/Makefile.in	2007-11-03 21:40:37.000000000 +0100
yann@1241
    26
+++ binutils-2.18.50.0.4/ld/Makefile.in	2009-03-07 12:17:30.000000000 +0100
yann@1241
    27
@@ -287,7 +287,7 @@
yann@475
    28
 # We put the scripts in the directory $(scriptdir)/ldscripts.
yann@475
    29
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
yann@475
    30
 # directives need to be different for native and cross linkers.
yann@475
    31
-scriptdir = $(tooldir)/lib
yann@475
    32
+scriptdir = $(libdir)
yann@475
    33
 BASEDIR = $(srcdir)/..
yann@475
    34
 BFDDIR = $(BASEDIR)/bfd
yann@475
    35
 INCDIR = $(BASEDIR)/include