Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.19/130-check_ldrunpath_length.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed May 18 23:00:46 2011 +0200 (2011-05-18)
changeset 2467 200836977ce6
permissions -rw-r--r--
config: rename variables that are arrays

Make it explicit that a variable is an array bu the name of the variable.
It will be used later when .config gets munged to allow both multiple
arguments and arguments with spaces at the same time to be passed from the
configuration down to the build scripts.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 Original patch from Gentoo:

     2 gentoo/src/patchsets/binutils/2.19/42_all_012_check_ldrunpath_length.patch

     3 

     4 Originaly from Debian:

     5 ## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>

     6 ##

     7 ## All lines beginning with `## DP:' are a description of the patch.

     8 ## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for

     9 ## DP: cases where -rpath isn't specified. (#151024)

    10 

    11 diff -durN binutils-2.19.orig/ld/emultempl/elf32.em binutils-2.19/ld/emultempl/elf32.em

    12 --- binutils-2.19.orig/ld/emultempl/elf32.em	2008-09-07 06:02:31.000000000 +0200

    13 +++ binutils-2.19/ld/emultempl/elf32.em	2008-11-23 16:25:51.000000000 +0100

    14 @@ -1219,6 +1219,8 @@

    15  	      && command_line.rpath == NULL)

    16  	    {

    17  	      lib_path = (const char *) getenv ("LD_RUN_PATH");

    18 +	      if ((lib_path) && (strlen (lib_path) == 0))

    19 +		  lib_path = NULL;

    20  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,

    21  						      force))

    22  		break;

    23 @@ -1404,6 +1406,8 @@

    24    rpath = command_line.rpath;

    25    if (rpath == NULL)

    26      rpath = (const char *) getenv ("LD_RUN_PATH");

    27 +  if ((rpath) && (strlen (rpath) == 0))

    28 +      rpath = NULL;

    29    if (! (bfd_elf_size_dynamic_sections

    30  	 (link_info.output_bfd, command_line.soname, rpath,

    31  	  command_line.filter_shlib,
crosstool-ng