patches/binutils/2.19.1a/130-check_ldrunpath_length.patch
author Daniel Price <daniel.price@gmail.com>
Tue Nov 20 16:59:17 2012 -0800 (2012-11-20)
changeset 3125 15cd5dc25929
parent 1243 5d15872659ec
permissions -rw-r--r--
scripts: fail on ':' in paths

Signed-off-by: Daniel Price <daniel.price@gmail.com>
[yann.morin.1998@free.fr: split original patch for self-contained changes]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <163f86b5216fc08c672a.1353459722@nipigon.dssd.com>
Patchwork-Id: 200536
     1 Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.19/130-check_ldrunpath_length.patch
     2 
     3 -= BEGIN original header =-
     4 Original patch from Gentoo:
     5 gentoo/src/patchsets/binutils/2.19/42_all_012_check_ldrunpath_length.patch
     6 
     7 Originaly from Debian:
     8 ## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
     9 ##
    10 ## All lines beginning with `## DP:' are a description of the patch.
    11 ## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
    12 ## DP: cases where -rpath isn't specified. (#151024)
    13 
    14 -= END original header =-
    15 
    16 diff -durN binutils-2.19.1.orig/ld/emultempl/elf32.em binutils-2.19.1/ld/emultempl/elf32.em
    17 --- binutils-2.19.1.orig/ld/emultempl/elf32.em	2008-09-07 06:02:31.000000000 +0200
    18 +++ binutils-2.19.1/ld/emultempl/elf32.em	2009-03-08 11:57:01.000000000 +0100
    19 @@ -1219,6 +1219,8 @@
    20  	      && command_line.rpath == NULL)
    21  	    {
    22  	      lib_path = (const char *) getenv ("LD_RUN_PATH");
    23 +	      if ((lib_path) && (strlen (lib_path) == 0))
    24 +		  lib_path = NULL;
    25  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
    26  						      force))
    27  		break;
    28 @@ -1404,6 +1406,8 @@
    29    rpath = command_line.rpath;
    30    if (rpath == NULL)
    31      rpath = (const char *) getenv ("LD_RUN_PATH");
    32 +  if ((rpath) && (strlen (rpath) == 0))
    33 +      rpath = NULL;
    34    if (! (bfd_elf_size_dynamic_sections
    35  	 (link_info.output_bfd, command_line.soname, rpath,
    36  	  command_line.filter_shlib,