public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glibc: Update to 2.20

Browse Source
This commit is contained in:
Eelco Dolstra
2014-10-29 17:54:47 +01:00
parent 119ce1ab03
commit dac591aae6
7 changed files with 9 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch
+5 -5
View File
@@ -1,12 +1,12 @@
diff -rupN a/elf/rtld.c b/elf/rtld.c
--- a/elf/rtld.c 2013-08-11 00:52:55.000000001 +0200
+++ b/elf/rtld.c 2014-02-18 13:56:19.000000001 +0100
@@ -1639,7 +1639,7 @@ ERROR: ld.so: object '%s' cannot be load
diff -ru glibc-2.20-orig/elf/rtld.c glibc-2.20/elf/rtld.c
--- glibc-2.20-orig/elf/rtld.c 2014-09-07 10:09:09.000000000 +0200
+++ glibc-2.20/elf/rtld.c 2014-10-27 11:32:25.203043157 +0100
@@ -1513,7 +1513,7 @@
open(). So we do this first. If it succeeds we do almost twice
the work but this does not matter, since it is not for production
use. */
- static const char preload_file[] = "/etc/ld.so.preload";
+ static const char preload_file[] = "/etc/ld-nix.so.preload";
if (__builtin_expect (__access (preload_file, R_OK) == 0, 0))
if (__glibc_unlikely (__access (preload_file, R_OK) == 0))
{
/* Read the contents of the file. */