Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.19.1a/130-check_ldrunpath_length.patch
author Titus von Boxberg <titus@v9g.de>
Tue Nov 06 17:02:06 2012 +0100 (2012-11-06)
changeset 3103 a8bf927f6e37
parent 1243 5d15872659ec
permissions -rw-r--r--
Makefile.in: Use only standard options compatible with BSD install

Don't use options specific to FSF's coreutils install.

Signed-off-by: Titus von Boxberg <titus@v9g.de>
Message-Id: <51587db99510a9ec08f8.1352226968@tschetwerikow.boxberg.lan>
Patchwork-Id: 197532 
     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,
crosstool-ng