patches/binutils/2.17/150-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 745 e445c00d134d
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 diff -dur binutils-2.17.old/ld/emultempl/elf32.em binutils-2.17/ld/emultempl/elf32.em
     2 --- binutils-2.17.old/ld/emultempl/elf32.em	2006-06-12 15:05:04.000000000 +0200
     3 +++ binutils-2.17/ld/emultempl/elf32.em	2007-05-01 18:26:13.000000000 +0200
     4 @@ -970,6 +970,8 @@
     5  	      && command_line.rpath == NULL)
     6  	    {
     7  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
     8 +	      if ((lib_path) && (strlen (lib_path) == 0))
     9 +		  lib_path = NULL;
    10  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
    11  						      force))
    12  		break;
    13 @@ -1154,6 +1156,8 @@
    14    rpath = command_line.rpath;
    15    if (rpath == NULL)
    16      rpath = (const char *) getenv ("LD_RUN_PATH");
    17 +  if ((rpath) && (strlen (rpath) == 0))
    18 +      rpath = NULL;
    19    if (! (bfd_elf_size_dynamic_sections
    20  	 (output_bfd, command_line.soname, rpath,
    21  	  command_line.filter_shlib,