pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch

   1 diff -Naur glibc-2.27-orig/elf/ldconfig.c glibc-2.27/elf/ldconfig.c
   2 --- glibc-2.27-orig/elf/ldconfig.c      2018-02-01 11:17:18.000000000 -0500
   3 +++ glibc-2.27/elf/ldconfig.c   2018-02-17 22:43:17.232175182 -0500
   4 @@ -51,7 +51,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.  */
  13 diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile
  14 --- glibc-2.27-orig/elf/Makefile        2018-02-01 11:17:18.000000000 -0500
  15 +++ glibc-2.27/elf/Makefile     2018-02-17 22:44:50.334006750 -0500
  16 @@ -559,13 +559,13 @@
  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
  35 diff -Naur glibc-2.27-orig/sysdeps/generic/dl-cache.h glibc-2.27/sysdeps/generic/dl-cache.h
  36 --- glibc-2.27-orig/sysdeps/generic/dl-cache.h  2018-02-01 11:17:18.000000000 -0500
  37 +++ glibc-2.27/sysdeps/generic/dl-cache.h       2018-02-17 22:45:20.471598816 -0500
  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