patches/binutils/2.20.1a/240-ld_makefile.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
parent 2088 4f21ba5f8e91
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

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