patches/binutils/2.18.50.0.6/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
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(-)
yann@475
     1
Check LD_RUN_PATH length, copied from buildroot.
yann@475
     2
yann@475
     3
 binutils-2.18.50.0.6/ld/emultempl/elf32.em |    4     4     0     0 ++++
yann@475
     4
 1 file changed, 4 insertions(+)
yann@475
     5
yann@475
     6
diff -durN binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em binutils-2.18.50.0.6/ld/emultempl/elf32.em
yann@475
     7
--- binutils-2.18.50.0.6.orig/ld/emultempl/elf32.em	2008-04-03 18:54:25.000000000 +0200
yann@475
     8
+++ binutils-2.18.50.0.6/ld/emultempl/elf32.em	2008-05-02 23:30:08.000000000 +0200
yann@475
     9
@@ -1220,6 +1220,8 @@
yann@475
    10
 	      && command_line.rpath == NULL)
yann@475
    11
 	    {
yann@475
    12
 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
yann@475
    13
+	      if ((lib_path) && (strlen (lib_path) == 0))
yann@475
    14
+		  lib_path = NULL;
yann@475
    15
 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
yann@475
    16
 						      force))
yann@475
    17
 		break;
yann@475
    18
@@ -1405,6 +1407,8 @@
yann@475
    19
   rpath = command_line.rpath;
yann@475
    20
   if (rpath == NULL)
yann@475
    21
     rpath = (const char *) getenv ("LD_RUN_PATH");
yann@475
    22
+  if ((rpath) && (strlen (rpath) == 0))
yann@475
    23
+      rpath = NULL;
yann@475
    24
   if (! (bfd_elf_size_dynamic_sections
yann@475
    25
 	 (link_info.output_bfd, command_line.soname, rpath,
yann@475
    26
 	  command_line.filter_shlib,