1.1 --- a/patches/binutils/2.19/130-check_ldrunpath_length.patch	Sun Sep 11 18:28:45 2011 +0200
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,31 +0,0 @@
     1.4 -Original patch from Gentoo:
     1.5 -gentoo/src/patchsets/binutils/2.19/42_all_012_check_ldrunpath_length.patch
     1.6 -
     1.7 -Originaly from Debian:
     1.8 -## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
     1.9 -##
    1.10 -## All lines beginning with `## DP:' are a description of the patch.
    1.11 -## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
    1.12 -## DP: cases where -rpath isn't specified. (#151024)
    1.13 -
    1.14 -diff -durN binutils-2.19.orig/ld/emultempl/elf32.em binutils-2.19/ld/emultempl/elf32.em
    1.15 ---- binutils-2.19.orig/ld/emultempl/elf32.em	2008-09-07 06:02:31.000000000 +0200
    1.16 -+++ binutils-2.19/ld/emultempl/elf32.em	2008-11-23 16:25:51.000000000 +0100
    1.17 -@@ -1219,6 +1219,8 @@
    1.18 - 	      && command_line.rpath == NULL)
    1.19 - 	    {
    1.20 - 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
    1.21 -+	      if ((lib_path) && (strlen (lib_path) == 0))
    1.22 -+		  lib_path = NULL;
    1.23 - 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
    1.24 - 						      force))
    1.25 - 		break;
    1.26 -@@ -1404,6 +1406,8 @@
    1.27 -   rpath = command_line.rpath;
    1.28 -   if (rpath == NULL)
    1.29 -     rpath = (const char *) getenv ("LD_RUN_PATH");
    1.30 -+  if ((rpath) && (strlen (rpath) == 0))
    1.31 -+      rpath = NULL;
    1.32 -   if (! (bfd_elf_size_dynamic_sections
    1.33 - 	 (link_info.output_bfd, command_line.soname, rpath,
    1.34 - 	  command_line.filter_shlib,