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/120-check-ldrunpath-length.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 Check LD_RUN_PATH length, copied from buildroot.

     2 

     3  binutils-2.18.50.0.6/ld/emultempl/elf32.em |    4     4     0     0 ++++

     4  1 file changed, 4 insertions(+)

     5 

     6 diff -durN binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em binutils-2.18.50.0.6/ld/emultempl/elf32.em

     7 --- binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em	2008-04-03 18:54:25.000000000 +0200

     8 +++ binutils-2.18.50.0.6/ld/emultempl/elf32.em	2008-05-02 23:30:08.000000000 +0200

     9 @@ -1220,6 +1220,8 @@

    10  	      && command_line.rpath == NULL)

    11  	    {

    12  	      lib_path = (const char *) getenv ("LD_RUN_PATH");

    13 +	      if ((lib_path) && (strlen (lib_path) == 0))

    14 +		  lib_path = NULL;

    15  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,

    16  						      force))

    17  		break;

    18 @@ -1405,6 +1407,8 @@

    19    rpath = command_line.rpath;

    20    if (rpath == NULL)

    21      rpath = (const char *) getenv ("LD_RUN_PATH");

    22 +  if ((rpath) && (strlen (rpath) == 0))

    23 +      rpath = NULL;

    24    if (! (bfd_elf_size_dynamic_sections

    25  	 (link_info.output_bfd, command_line.soname, rpath,

    26  	  command_line.filter_shlib,
crosstool-ng