Unverified Commit acdcb856 authored by Bernardo Meurer's avatar Bernardo Meurer Committed by Vladimír Čunát
Browse files

glibc: 2.32-46 -> 2.33-45

parent 5a71fa84

pkgs/development/libraries/glibc/2.32-master.patch.gz

deleted100644 → 0
−65.3 KiB

File deleted.

View file

pkgs/development/libraries/glibc/2.33-master.patch.gz

0 → 100644
+53.9 KiB

File added.

No diff preview for this file type.

View file

pkgs/development/libraries/glibc/common.nix

+8 −8
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ 
} @ args:



let

  version = "2.32";

  patchSuffix = "-48";

  sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn";

  version = "2.33";

  patchSuffix = "-45";

  sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8=";

in



assert withLinuxHeaders -> linuxHeaders != null;
@@ -60,14 +60,14 @@ stdenv.mkDerivation ({ 
  patches =

    [

      /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping.

          $ git fetch --all -p && git checkout origin/release/2.32/master && git describe

          glibc-2.32-48-g16949aeaa0

          $ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz

          $ git fetch --all -p && git checkout origin/release/2.33/master && git describe

          glibc-2.33-45-g58b90461ae

          $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz



         To compare the archive contents zdiff can be used.

          $ zdiff -u 2.32-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz

          $ zdiff -u 2.33-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz

       */

      ./2.32-master.patch.gz

      ./2.33-master.patch.gz



      /* Allow NixOS and Nix to handle the locale-archive. */

      ./nix-locale-archive.patch

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

+39 −21
Original line number Diff line number Diff line 
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 @@

diff --git a/elf/Makefile b/elf/Makefile

index 5d666b1b..a5017e9c 100644

--- a/elf/Makefile

+++ b/elf/Makefile

@@ -669,14 +669,14 @@ $(objpfx)sln: $(sln-modules:%=$(objpfx)%.o)

 

 $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
@@ -26,16 +15,45 @@ diff -Naur glibc-2.27-orig/elf/Makefile glibc-2.27/elf/Makefile 
-CFLAGS-dl-cache.c += $(SYSCONF-FLAGS)

-CFLAGS-cache.c += $(SYSCONF-FLAGS)

-CFLAGS-rtld.c += $(SYSCONF-FLAGS)

-CFLAGS-dl-usage.c += $(SYSCONF-FLAGS) \

+CFLAGS-dl-cache.c += $(PREFIX-FLAGS)

+CFLAGS-cache.c += $(PREFIX-FLAGS)

+CFLAGS-rtld.c += $(PREFIX-FLAGS)

+CFLAGS-dl-usage.c += $(PREFIX-FLAGS) \

   -D'RTLD="$(rtlddir)/$(rtld-installed-name)"'

 

 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 @@

diff --git a/elf/dl-diagnostics.c b/elf/dl-diagnostics.c

index bef224b3..8e166b12 100644

--- a/elf/dl-diagnostics.c

+++ b/elf/dl-diagnostics.c

@@ -205,7 +205,7 @@ print_paths (void)

 {

   _dl_diagnostics_print_labeled_string ("path.prefix", PREFIX);

   _dl_diagnostics_print_labeled_string ("path.rtld", RTLD);

-  _dl_diagnostics_print_labeled_string ("path.sysconfdir", SYSCONFDIR);

+  _dl_diagnostics_print_labeled_string ("path.sysconfdir", PREFIX "/etc");



   unsigned int index = 0;

   static const char *system_dirs = SYSTEM_DIRS "\0";

diff --git a/elf/ldconfig.c b/elf/ldconfig.c

index 28ed637a..6f07b79a 100644

--- a/elf/ldconfig.c

+++ b/elf/ldconfig.c

@@ -57,7 +57,7 @@

 #define TLS_HWCAP_BIT 63

 

 #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 --git a/sysdeps/generic/dl-cache.h b/sysdeps/generic/dl-cache.h

index 964d50a4..2224d651 100644

--- a/sysdeps/generic/dl-cache.h

+++ b/sysdeps/generic/dl-cache.h

@@ -35,7 +35,7 @@

 #endif

 

 #ifndef LD_SO_CACHE