Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/binutils/2.21.1a/300-012_check_ldrunpath_length.patch
author Willy Tarreau <w@1wt.eu>
Tue Nov 15 19:11:57 2011 +0100 (2011-11-15)
changeset 2751 bd17cca444ae
permissions -rw-r--r--
debug/gdb: fix tic install path, tell ncurses where to find it

ncurses 5.9 wants tic to be either one of:
- $TIC_PATH
- /usr/bin/tic

Of course, se do not want the latter, for it can be incompatible if the
ncurses in the build system is too old (eg. RHEL 5.6, Debian Lenny...).
So, force TIC_PATH to the location of our own tic.

Also, install tic alongside the other build tools, not in a sub-dir
of the toolchain installation dir.

Signed-off-by: Willy Tarreau <w@1wt.eu>
[yann.morin.1998@anciens.enib.fr: install in builtools/bin, move TIC_PATH]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
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)
crosstool-ng