patches/binutils/2.18.50.0.8/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 652 bed1088fd34d
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@652
     1
diff -durN binutils-2.18.50.0.8.orig/ld/Makefile.am binutils-2.18.50.0.8/ld/Makefile.am
yann@652
     2
--- binutils-2.18.50.0.8.orig/ld/Makefile.am	2008-04-03 18:54:05.000000000 +0200
yann@652
     3
+++ binutils-2.18.50.0.8/ld/Makefile.am	2008-07-13 23:15:40.000000000 +0200
yann@652
     4
@@ -18,7 +18,7 @@
yann@652
     5
 # We put the scripts in the directory $(scriptdir)/ldscripts.
yann@652
     6
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
yann@652
     7
 # directives need to be different for native and cross linkers.
yann@652
     8
-scriptdir = $(tooldir)/lib
yann@652
     9
+scriptdir = $(libdir)
yann@652
    10
 
yann@652
    11
 EMUL = @EMUL@
yann@652
    12
 EMULATION_OFILES = @EMULATION_OFILES@
yann@652
    13
diff -durN binutils-2.18.50.0.8.orig/ld/Makefile.in binutils-2.18.50.0.8/ld/Makefile.in
yann@652
    14
--- binutils-2.18.50.0.8.orig/ld/Makefile.in	2008-07-10 17:32:58.000000000 +0200
yann@652
    15
+++ binutils-2.18.50.0.8/ld/Makefile.in	2008-07-13 23:15:40.000000000 +0200
yann@652
    16
@@ -290,7 +290,7 @@
yann@652
    17
 # We put the scripts in the directory $(scriptdir)/ldscripts.
yann@652
    18
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
yann@652
    19
 # directives need to be different for native and cross linkers.
yann@652
    20
-scriptdir = $(tooldir)/lib
yann@652
    21
+scriptdir = $(libdir)
yann@652
    22
 BASEDIR = $(srcdir)/..
yann@652
    23
 BFDDIR = $(BASEDIR)/bfd
yann@652
    24
 INCDIR = $(BASEDIR)/include