pyrox.dev
1diff -ru glibc-2.16.0-orig/elf/ldconfig.c glibc-2.16.0/elf/ldconfig.c
2--- glibc-2.16.0-orig/elf/ldconfig.c 2012-06-30 15:12:34.000000000 -0400
3+++ glibc-2.16.0/elf/ldconfig.c 2012-09-18 11:59:27.463284814 -0400
4@@ -50,7 +50,7 @@
5 #endif
6
7 #ifndef LD_SO_CONF
8-# define LD_SO_CONF SYSCONFDIR "/ld.so.conf"
9+# define LD_SO_CONF PREFIX "/etc/ld.so.conf"
10 #endif
11
12 /* Get libc version number. */
13diff -ru glibc-2.16.0-orig/elf/Makefile glibc-2.16.0/elf/Makefile
14--- glibc-2.16.0-orig/elf/Makefile 2012-06-30 15:12:34.000000000 -0400
15+++ glibc-2.16.0/elf/Makefile 2012-09-18 12:03:30.031955196 -0400
16@@ -415,12 +415,12 @@
17
18 $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
19
20-SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"'
21-CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \
22+PREFIX-FLAGS := -D'PREFIX="$(prefix)"'
23+CFLAGS-ldconfig.c = $(PREFIX-FLAGS) -D'LIBDIR="$(libdir)"' \
24 -D'SLIBDIR="$(slibdir)"'
25 libof-ldconfig = ldconfig
26-CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
27-CFLAGS-cache.c = $(SYSCONF-FLAGS)
28-CFLAGS-rtld.c = $(SYSCONF-FLAGS)
29+CFLAGS-dl-cache.c = $(PREFIX-FLAGS)
30+CFLAGS-cache.c = $(PREFIX-FLAGS)
31+CFLAGS-rtld.c = $(PREFIX-FLAGS)
32
33 cpp-srcs-left := $(all-rtld-routines:=.os)
34 lib := rtld
35diff -ru glibc-2.16.0-orig/sysdeps/generic/dl-cache.h glibc-2.16.0/sysdeps/generic/dl-cache.h
36--- glibc-2.16.0-orig/sysdeps/generic/dl-cache.h 2012-06-30 15:12:34.000000000 -0400
37+++ glibc-2.16.0/sysdeps/generic/dl-cache.h 2012-09-18 11:59:27.465284809 -0400
38@@ -28,7 +28,7 @@
39 #endif
40
41 #ifndef LD_SO_CACHE
42-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache"
43+# define LD_SO_CACHE PREFIX "/etc/ld.so.cache"
44 #endif
45
46 #ifndef add_system_dir