patches/binutils/2.21.1a/300-001_ld_makefile_patch.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
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>
yann@2665
     1
diff -durN binutils-2.21.1.orig/ld/Makefile.am binutils-2.21.1/ld/Makefile.am
yann@2665
     2
--- binutils-2.21.1.orig/ld/Makefile.am	2011-03-16 09:37:30.000000000 +0100
yann@2665
     3
+++ binutils-2.21.1/ld/Makefile.am	2011-09-12 13:39:07.962244866 +0200
yann@2665
     4
@@ -37,7 +37,7 @@
yann@2665
     5
 # We put the scripts in the directory $(scriptdir)/ldscripts.
yann@2665
     6
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
yann@2665
     7
 # directives need to be different for native and cross linkers.
yann@2665
     8
-scriptdir = $(tooldir)/lib
yann@2665
     9
+scriptdir = $(libdir)
yann@2665
    10
 
yann@2665
    11
 EMUL = @EMUL@
yann@2665
    12
 EMULATION_OFILES = @EMULATION_OFILES@
yann@2665
    13
diff -durN binutils-2.21.1.orig/ld/Makefile.in binutils-2.21.1/ld/Makefile.in
yann@2665
    14
--- binutils-2.21.1.orig/ld/Makefile.in	2011-03-16 09:37:30.000000000 +0100
yann@2665
    15
+++ binutils-2.21.1/ld/Makefile.in	2011-09-12 13:39:07.962244866 +0200
yann@2665
    16
@@ -365,7 +365,7 @@
yann@2665
    17
 # We put the scripts in the directory $(scriptdir)/ldscripts.
yann@2665
    18
 # We can't put the scripts in $(datadir) because the SEARCH_DIR
yann@2665
    19
 # directives need to be different for native and cross linkers.
yann@2665
    20
-scriptdir = $(tooldir)/lib
yann@2665
    21
+scriptdir = $(libdir)
yann@2665
    22
 BASEDIR = $(srcdir)/..
yann@2665
    23
 BFDDIR = $(BASEDIR)/bfd
yann@2665
    24
 INCDIR = $(BASEDIR)/include