mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
nixpkgs/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch

47 lines
1.6 KiB
Diff
Raw Normal View History

glibc: Update to 2.16
2012-09-18 17:38:43 +01:00
diff -ru glibc-2.16.0-orig/elf/ldconfig.c glibc-2.16.0/elf/ldconfig.c
--- glibc-2.16.0-orig/elf/ldconfig.c 2012-06-30 15:12:34.000000000 -0400
+++ glibc-2.16.0/elf/ldconfig.c 2012-09-18 11:59:27.463284814 -0400
@@ -50,7 +50,7 @@
#endif
#ifndef LD_SO_CONF
-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
+# define LD_SO_CONF PREFIX "/etc/ld.so.conf"
#endif
/* Get libc version number. */
diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile
--- glibc-2.16.0-orig/elf/Makefile 2012-06-30 15:12:34.000000000 -0400
+++ glibc-2.16.0/elf/Makefile 2012-09-18 12:03:30.031955196 -0400
@@ -415,12 +415,12 @@
glibc: update 2.20 -> 2.21, including security fixes Fixes #6578. https://sourceware.org/ml/libc-alpha/2015-02/msg00119.html - I had to disable one warning-error type. - One of our patches needed modification - it seemed that just the context changed without affecting the purpose of the patch.
2015-03-02 20:24:55 +00:00
$(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
glibc: Update to 2.16
2012-09-18 17:38:43 +01:00
-SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
-CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
+PREFIX-FLAGS := -D'PREFIX="$(prefix)"'
+CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \
glibc: update 2.20 -> 2.21, including security fixes Fixes #6578. https://sourceware.org/ml/libc-alpha/2015-02/msg00119.html - I had to disable one warning-error type. - One of our patches needed modification - it seemed that just the context changed without affecting the purpose of the patch.
2015-03-02 20:24:55 +00:00
-D'SLIBDIR="$(slibdir)"'
libof-ldconfig = ldconfig
glibc: Update to 2.16
2012-09-18 17:38:43 +01:00
-CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
-CFLAGS-cache.c = $(SYSCONF-FLAGS)
-CFLAGS-rtld.c = $(SYSCONF-FLAGS)
+CFLAGS-dl-cache.c = $(PREFIX-FLAGS)
+CFLAGS-cache.c = $(PREFIX-FLAGS)
+CFLAGS-rtld.c = $(PREFIX-FLAGS)
glibc: update 2.20 -> 2.21, including security fixes Fixes #6578. https://sourceware.org/ml/libc-alpha/2015-02/msg00119.html - I had to disable one warning-error type. - One of our patches needed modification - it seemed that just the context changed without affecting the purpose of the patch.
2015-03-02 20:24:55 +00:00
cpp-srcs-left := $(all-rtld-routines:=.os)
lib := rtld
glibc: Update to 2.16
2012-09-18 17:38:43 +01:00
diff -ru glibc-2.16.0-orig/sysdeps/generic/dl-cache.h glibc-2.16.0/sysdeps/generic/dl-cache.h
--- glibc-2.16.0-orig/sysdeps/generic/dl-cache.h 2012-06-30 15:12:34.000000000 -0400
+++ glibc-2.16.0/sysdeps/generic/dl-cache.h 2012-09-18 11:59:27.465284809 -0400
@@ -28,7 +28,7 @@
#endif
#ifndef LD_SO_CACHE
-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache"
+# define LD_SO_CACHE PREFIX "/etc/ld.so.cache"
#endif
#ifndef add_system_dir
Copy permalink