Merge #66528: glibc: 2.27 -> 2.30 (into staging)

Includes update of stdenv bootstap tools (for three main platforms) and many package fixes with new glibc.
2020-02-05 13:41:09 +01:00
parent 15021db2fa 5ca088f1cc
commit 48a997cd76
65 changed files with 436 additions and 406 deletions
@@ -185,7 +185,10 @@ callPackage (import ./generic.nix (rec {
    # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
    sed 1i'#include <sys/sysmacros.h>' \
      -i tools/blktap2/control/tap-ctl-allocate.c \
-      -i tools/libxl/libxl_device.c
+      -i tools/libxl/libxl_device.c \
+      ${optionalString withInternalQemu "-i tools/qemu-xen/hw/9pfs/9p.c"}
+
+    sed -i -e '/sys\/sysctl\.h/d' tools/blktap2/drivers/block-remus.c
  '';

  passthru.qemu-system-i386 = if withInternalQemu