patches/binutils/2.20.1a/240-ld_makefile.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
parent 2088 4f21ba5f8e91
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
jocke@1700
     1
Description: correct where ld scripts are installed
jocke@1700
     2
Author: Chris Chimelis <chris@debian.org>
jocke@1700
     3
yann@2088
     4
diff -durN binutils-2.20.1.orig/ld/Makefile.am binutils-2.20.1/ld/Makefile.am
yann@2088
     5
--- binutils-2.20.1.orig/ld/Makefile.am	2010-02-22 09:07:01.000000000 +0100
yann@2088
     6
+++ binutils-2.20.1/ld/Makefile.am	2010-08-17 19:32:21.000000000 +0200
yann@2088
     7
@@ -24,7 +24,7 @@
jocke@1700
     8
 # We put the scripts in the directory $(scriptdir)/ldscripts.
jocke@1700
     9
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
jocke@1700
    10
 # directives need to be different for native and cross linkers.
jocke@1700
    11
-scriptdir = $(tooldir)/lib
jocke@1700
    12
+scriptdir = $(libdir)
jocke@1700
    13
 
jocke@1700
    14
 EMUL = @EMUL@
jocke@1700
    15
 EMULATION_OFILES = @EMULATION_OFILES@
yann@2088
    16
diff -durN binutils-2.20.1.orig/ld/Makefile.in binutils-2.20.1/ld/Makefile.in
yann@2088
    17
--- binutils-2.20.1.orig/ld/Makefile.in	2010-03-03 15:06:21.000000000 +0100
yann@2088
    18
+++ binutils-2.20.1/ld/Makefile.in	2010-08-17 19:32:21.000000000 +0200
yann@2088
    19
@@ -333,7 +333,7 @@
jocke@1700
    20
 # We put the scripts in the directory $(scriptdir)/ldscripts.
jocke@1700
    21
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
jocke@1700
    22
 # directives need to be different for native and cross linkers.
jocke@1700
    23
-scriptdir = $(tooldir)/lib
jocke@1700
    24
+scriptdir = $(libdir)
jocke@1700
    25
 BASEDIR = $(srcdir)/..
jocke@1700
    26
 BFDDIR = $(BASEDIR)/bfd
jocke@1700
    27
 INCDIR = $(BASEDIR)/include