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>
Fri Jan 28 22:06:49 2011 +0100 (2011-01-28)
changeset 2284 7ede374110e5
permissions -rw-r--r--
config: add an option not to remove the destination directory

In certain circumstances, removing the destination/installation directory
is a bad idea. For example, when the build environment is already taking
care of sanitising the build tree, and pre-installs stuff in there, it is
a very bad idea to remove the destination directory.

This happens now in buildroot, as the crostool-NG backend now installs the
toolchain in the common host-tools directory, and pre-install there a few
host-utilities (eg. host-automake and host-gawk).

Provide a config knob to turn on/off the removal of the destination
directory, defaulting to 'y' (previous behavior), and forced to 'n' when
used as a backend.

Reported-by: Peter Korsgaard <jacmet@sunsite.dk>
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