Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.18.50.0.4/110-ld-makefile-path.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jan 25 17:53:14 2009 +0000 (2009-01-25)
changeset 1150 218f7a0e8d71
parent 475 150c918bcb7b
child 1241 d9bcfb2d7369
permissions -rw-r--r--
On 20090120.2203+0100, Andy Johnson <ajohnson@aecno.com> wrote:
The glibc.sh script doesn't handle the glibc versions with
an underscore very well (bash expected integer error). I
have attached a small patch for that. Instead of looking
for "not period" I changed the sense to look for numbers.
I initially tried to make it look for either a period or
an underscore, but that didn't work like I wanted (probably
because I did something wrong).

Original patch modified to be more robust.

/trunk/scripts/build/libc/glibc.sh | 8 4 4 0 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 
     1 Fix ld scripts path, copied from buildroot.

     2 

     3  binutils-2.18.50.0.6/ld/Makefile.am |    2     1     1     0 +-

     4  binutils-2.18.50.0.6/ld/Makefile.in |    2     1     1     0 +-

     5  2 files changed, 2 insertions(+), 2 deletions(-)

     6 

     7 diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.am binutils-2.18.50.0.6/ld/Makefile.am

     8 --- binutils-2.18.50.0.6.orig/ld/Makefile.am	2008-04-03 18:54:05.000000000 +0200

     9 +++ binutils-2.18.50.0.6/ld/Makefile.am	2008-05-02 23:25:14.000000000 +0200

    10 @@ -18,7 +18,7 @@

    11  # We put the scripts in the directory $(scriptdir)/ldscripts.

    12  # We can't put the scripts in $(datadir) because the SEARCH_DIR

    13  # directives need to be different for native and cross linkers.

    14 -scriptdir = $(tooldir)/lib

    15 +scriptdir = $(libdir)

    16  

    17  EMUL = @EMUL@

    18  EMULATION_OFILES = @EMULATION_OFILES@

    19 diff -durN binutils-2.18.50.0.6.orig/ld/Makefile.in binutils-2.18.50.0.6/ld/Makefile.in

    20 --- binutils-2.18.50.0.6.orig/ld/Makefile.in	2008-04-03 18:54:05.000000000 +0200

    21 +++ binutils-2.18.50.0.6/ld/Makefile.in	2008-05-02 23:25:14.000000000 +0200

    22 @@ -288,7 +288,7 @@

    23  # We put the scripts in the directory $(scriptdir)/ldscripts.

    24  # We can't put the scripts in $(datadir) because the SEARCH_DIR

    25  # directives need to be different for native and cross linkers.

    26 -scriptdir = $(tooldir)/lib

    27 +scriptdir = $(libdir)

    28  BASEDIR = $(srcdir)/..

    29  BFDDIR = $(BASEDIR)/bfd

    30  INCDIR = $(BASEDIR)/include
crosstool-ng