mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-17 02:14:36 +00:00
5ca088f1cc
I suppose the diff of the glibc-upgrade branch is a bit cleaner without including these unnecessary changes.
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
diff -Naur glibc-2.27-orig/elf/ldconfig.c glibc-2.27/elf/ldconfig.c
|
|
--- glibc-2.27-orig/elf/ldconfig.c 2018-02-01 11:17:18.000000000 -0500
|
|
+++ glibc-2.27/elf/ldconfig.c 2018-02-17 22:43:17.232175182 -0500
|
|
@@ -51,7 +51,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 -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile
|
|
--- glibc-2.27-orig/elf/Makefile 2018-02-01 11:17:18.000000000 -0500
|
|
+++ glibc-2.27/elf/Makefile 2018-02-17 22:44:50.334006750 -0500
|
|
@@ -559,13 +559,13 @@
|
|
|
|
$(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
|
|
|
|
-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)"' \
|
|
-D'SLIBDIR="$(slibdir)"'
|
|
libof-ldconfig = ldconfig
|
|
-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)
|
|
|
|
cpp-srcs-left := $(all-rtld-routines:=.os)
|
|
lib := rtld
|
|
diff -Naur glibc-2.27-orig/sysdeps/generic/dl-cache.h glibc-2.27/sysdeps/generic/dl-cache.h
|
|
--- glibc-2.27-orig/sysdeps/generic/dl-cache.h 2018-02-01 11:17:18.000000000 -0500
|
|
+++ glibc-2.27/sysdeps/generic/dl-cache.h 2018-02-17 22:45:20.471598816 -0500
|
|
@@ -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
|