patches/binutils/2.17/150-check_ldrunpath_length.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:05:32 2011 +0200 (2011-05-19)
branch1.11
changeset 2463 7f87237857a0
parent 745 e445c00d134d
permissions -rw-r--r--
complibs/ppl: update GMP location configuration argument for PPL v0.11 and later

'configure' for PPL 0.11 (and later) needs "--with-gmp-prefix" to
provide the location of the GMP toolkit; the previous switches were
"--with-libgmp-prefix" and "--with-libgmpxx-prefix".

The upstream log message is:

commit 08dfb6fea094f8c5a533575a3ea2095edce99a6d
Author: Roberto Bagnara <bagnara@cs.unipr.it>
Date: Sun Jul 12 21:39:46 2009 +0200

New configure option --with-gmp-prefix supersedes the (now removed)
options --with-libgmp-prefix and --with-libgmpxx-prefix.

Link: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=08dfb6fea094f8c5a533575a3ea2095edce99a6d

Since PPL's 'configure' ignores unknown switches, we use all three so we
don't have to conditionalize the ppl.sh build script itself.

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 4f0c4fb572e2862c24b28e8d27ce7e9cb9adba65)
yann@55
     1
diff -dur binutils-2.17.old/ld/emultempl/elf32.em binutils-2.17/ld/emultempl/elf32.em
yann@55
     2
--- binutils-2.17.old/ld/emultempl/elf32.em	2006-06-12 15:05:04.000000000 +0200
yann@55
     3
+++ binutils-2.17/ld/emultempl/elf32.em	2007-05-01 18:26:13.000000000 +0200
yann@55
     4
@@ -970,6 +970,8 @@
yann@55
     5
 	      && command_line.rpath == NULL)
yann@55
     6
 	    {
yann@55
     7
 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
yann@55
     8
+	      if ((lib_path) && (strlen (lib_path) == 0))
yann@55
     9
+		  lib_path = NULL;
yann@55
    10
 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
yann@55
    11
 						      force))
yann@55
    12
 		break;
yann@55
    13
@@ -1154,6 +1156,8 @@
yann@55
    14
   rpath = command_line.rpath;
yann@55
    15
   if (rpath == NULL)
yann@55
    16
     rpath = (const char *) getenv ("LD_RUN_PATH");
yann@55
    17
+  if ((rpath) && (strlen (rpath) == 0))
yann@55
    18
+      rpath = NULL;
yann@55
    19
   if (! (bfd_elf_size_dynamic_sections
yann@55
    20
 	 (output_bfd, command_line.soname, rpath,
yann@55
    21
 	  command_line.filter_shlib,