patches/binutils/2.19/130-check_ldrunpath_length.patch
author Oron Peled <oron@actcom.co.il>
Mon Aug 03 23:11:53 2009 +0200 (2009-08-03)
branch1.4
changeset 1455 e6a3b4ffe576
permissions -rw-r--r--
[configure] Fix automake version check

The configure script fails on automake-1.11 (in Fedora-11) since
it looks for 3-digit version number.

"Yann E. MORIN", added the following comment:

The check for the automake version is not against a 3-digit number,
but really against a 3-part version number, a-la 'x.y.z'. Versions
such as 1.10 and 1.11 are also valid.
     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,