patches/binutils/2.17a/130-ld_makefile_patch.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 747 d3e603e7c17c
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 diff -dur binutils-2.17.old/ld/Makefile.am binutils-2.17/ld/Makefile.am
     2 --- binutils-2.17.old/ld/Makefile.am	2006-06-03 06:45:50.000000000 +0200
     3 +++ binutils-2.17/ld/Makefile.am	2007-05-01 18:26:09.000000000 +0200
     4 @@ -20,7 +20,7 @@
     5  # We put the scripts in the directory $(scriptdir)/ldscripts.
     6  # We can't put the scripts in $(datadir) because the SEARCH_DIR
     7  # directives need to be different for native and cross linkers.
     8 -scriptdir = $(tooldir)/lib
     9 +scriptdir = $(libdir)
    10  
    11  EMUL = @EMUL@
    12  EMULATION_OFILES = @EMULATION_OFILES@
    13 diff -dur binutils-2.17.old/ld/Makefile.in binutils-2.17/ld/Makefile.in
    14 --- binutils-2.17.old/ld/Makefile.in	2006-06-03 06:45:50.000000000 +0200
    15 +++ binutils-2.17/ld/Makefile.in	2007-05-01 18:26:09.000000000 +0200
    16 @@ -269,7 +269,7 @@
    17  # We put the scripts in the directory $(scriptdir)/ldscripts.
    18  # We can't put the scripts in $(datadir) because the SEARCH_DIR
    19  # directives need to be different for native and cross linkers.
    20 -scriptdir = $(tooldir)/lib
    21 +scriptdir = $(libdir)
    22  BASEDIR = $(srcdir)/..
    23  BFDDIR = $(BASEDIR)/bfd
    24  INCDIR = $(BASEDIR)/include