patches/binutils/2.21.1a/300-012_check_ldrunpath_length.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Oct 16 20:57:44 2012 +0200 (2012-10-16)
changeset 3079 37831a33e07e
permissions -rw-r--r--
kernel/linux: fix using custom location

Currently, extract and patch are skipped as thus:
- using a custom directory of pre-installed headers
- a correctly named directory already exists

Otherwise, extract and patch are done.

The current second condition is wrong, because it allows the following
sequence to happen:
- a non-custom kernel is used
- a previous build only partially extracted the non-custom sources
- that p[revious build broke during extraction (eg. incomplete tarball...)
- a subsequent build will find a properly named directory, and will
thus skip extract and patch, which is wrong

Fix that by following the conditions in this table:

Type | Extract | Patch
----------------------+---------+-------
Pre-installed headers | N | N
custom directory | N | N
custom tarball | Y | N
mainstream tarball | Y | Y

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Holsgrove <david.holsgrove@xilinx.com>
yann@2665
     1
diff -durN binutils-2.21.1.orig/ld/emultempl/elf32.em binutils-2.21.1/ld/emultempl/elf32.em
yann@2665
     2
--- binutils-2.21.1.orig/ld/emultempl/elf32.em	2011-06-27 09:39:14.000000000 +0200
yann@2665
     3
+++ binutils-2.21.1/ld/emultempl/elf32.em	2011-09-12 13:39:08.808908274 +0200
yann@2665
     4
@@ -1272,6 +1272,8 @@
yann@2665
     5
 	      && command_line.rpath == NULL)
yann@2665
     6
 	    {
yann@2665
     7
 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
yann@2665
     8
+	      if ((lib_path) && (strlen (lib_path) == 0))
yann@2665
     9
+	      	lib_path = NULL;
yann@2665
    10
 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
yann@2665
    11
 						      force))
yann@2665
    12
 		break;
yann@2665
    13
@@ -1499,6 +1501,8 @@
yann@2665
    14
   rpath = command_line.rpath;
yann@2665
    15
   if (rpath == NULL)
yann@2665
    16
     rpath = (const char *) getenv ("LD_RUN_PATH");
yann@2665
    17
+  if ((rpath) && (strlen (rpath) == 0))
yann@2665
    18
+  	rpath = NULL;
yann@2665
    19
 
yann@2665
    20
   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
yann@2665
    21
     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)