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