patches/binutils/2.19.1/130-check_ldrunpath_length.patch
author Arnaud Lacombe <lacombar@gmail.com>
Thu Aug 05 17:59:49 2010 +0200 (2010-08-05)
changeset 2067 477c7955e6b0
permissions -rw-r--r--
complibs/ppl: fix PPL build with GMP 5.x.x

From http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=9c19bc2b318a35016e0189f9552c98910be37f53

Author: Roberto Bagnara <bagnara@cs.unipr.it>
Revision log: Added support for GMP 5.0.

Adapted manually to match and not having to re-generate the configure script.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
     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,