patches/binutils/2.19.1/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)
yann@1243
     1
Original patch from: ../crosstool-NG/ct-ng.trunk/patches/binutils/2.19/130-check_ldrunpath_length.patch
yann@1243
     2
yann@1243
     3
-= BEGIN original header =-
yann@1243
     4
Original patch from Gentoo:
yann@1243
     5
gentoo/src/patchsets/binutils/2.19/42_all_012_check_ldrunpath_length.patch
yann@1243
     6
yann@1243
     7
Originaly from Debian:
yann@1243
     8
## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org>
yann@1243
     9
##
yann@1243
    10
## All lines beginning with `## DP:' are a description of the patch.
yann@1243
    11
## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
yann@1243
    12
## DP: cases where -rpath isn't specified. (#151024)
yann@1243
    13
yann@1243
    14
-= END original header =-
yann@1243
    15
yann@1243
    16
diff -durN binutils-2.19.1.orig/ld/emultempl/elf32.em binutils-2.19.1/ld/emultempl/elf32.em
yann@1243
    17
--- binutils-2.19.1.orig/ld/emultempl/elf32.em	2008-09-07 06:02:31.000000000 +0200
yann@1243
    18
+++ binutils-2.19.1/ld/emultempl/elf32.em	2009-03-08 11:57:01.000000000 +0100
yann@1243
    19
@@ -1219,6 +1219,8 @@
yann@1243
    20
 	      && command_line.rpath == NULL)
yann@1243
    21
 	    {
yann@1243
    22
 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
yann@1243
    23
+	      if ((lib_path) && (strlen (lib_path) == 0))
yann@1243
    24
+		  lib_path = NULL;
yann@1243
    25
 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
yann@1243
    26
 						      force))
yann@1243
    27
 		break;
yann@1243
    28
@@ -1404,6 +1406,8 @@
yann@1243
    29
   rpath = command_line.rpath;
yann@1243
    30
   if (rpath == NULL)
yann@1243
    31
     rpath = (const char *) getenv ("LD_RUN_PATH");
yann@1243
    32
+  if ((rpath) && (strlen (rpath) == 0))
yann@1243
    33
+      rpath = NULL;
yann@1243
    34
   if (! (bfd_elf_size_dynamic_sections
yann@1243
    35
 	 (link_info.output_bfd, command_line.soname, rpath,
yann@1243
    36
 	  command_line.filter_shlib,