summary refs log tree commit diff
path: root/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-27 11:34:38 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-29 13:42:59 +0100
commit1b55b07eeb43ba41470eed1ce21991df96110e70 (patch)
treeff072d1eeedf640261886a76c3f4610b80e9feb1 /pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch
parent2ee8b30b64a0ee2837c3630a50ec1a74820b7047 (diff)
downloadnixpkgs-1b55b07eeb43ba41470eed1ce21991df96110e70.tar
nixpkgs-1b55b07eeb43ba41470eed1ce21991df96110e70.tar.gz
nixpkgs-1b55b07eeb43ba41470eed1ce21991df96110e70.tar.bz2
nixpkgs-1b55b07eeb43ba41470eed1ce21991df96110e70.tar.lz
nixpkgs-1b55b07eeb43ba41470eed1ce21991df96110e70.tar.xz
nixpkgs-1b55b07eeb43ba41470eed1ce21991df96110e70.tar.zst
nixpkgs-1b55b07eeb43ba41470eed1ce21991df96110e70.zip
glibc/2.19 -> glibc
We only have one version of Glibc so no need for a separate directory.
Diffstat (limited to 'pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch')
-rw-r--r--pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch
new file mode 100644
index 00000000000..fabb6c3ec5e
--- /dev/null
+++ b/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch
@@ -0,0 +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
+      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))
+     {
+       /* Read the contents of the file.  */