patches/binutils/2.19/130-check_ldrunpath_length.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567)
     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,