Revert "Merge: glibc: 2.24 -> 2.25"
This reverts commit1daf2e26d2
, reversing changes made toc0c50dfcb7
. It seems this is what has been causing all the reliability problems on Hydra. I'm currently unable to find why it happens, so I'm forced to revert the update for now. Discussion: #22874.
This commit is contained in:
parent
7832806e20
commit
55cc7700e9
|
@ -28,17 +28,7 @@ stdenv.mkDerivation rec {
|
|||
src = ./config-compat.patch;
|
||||
inherit configVersion;
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "glibc-2.25.diff";
|
||||
url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c";
|
||||
sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz";
|
||||
})
|
||||
];
|
||||
# additionally required for the glibc-2.25 patch; avoid requiring gperf
|
||||
postPatch = ''
|
||||
sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf}
|
||||
touch src/*
|
||||
'';
|
||||
|
||||
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
|
||||
|
||||
|
|
|
@ -10,8 +10,8 @@ cross:
|
|||
, preConfigure ? "", ... }@args:
|
||||
|
||||
let
|
||||
version = "2.25";
|
||||
sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0";
|
||||
version = "2.24";
|
||||
sha256 = "1ghzp41ryvsqxn4rhrm8r25wc33m2jf8zrcc1pj3jxyk8ad9a0by";
|
||||
in
|
||||
|
||||
assert cross != null -> gccCross != null;
|
||||
|
@ -138,7 +138,7 @@ stdenv.mkDerivation ({
|
|||
lib.optionalString (cross != null) "-${cross.config}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/glibc/glibc-${version}.tar.xz";
|
||||
url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
|
|
|
@ -81,7 +81,7 @@ in
|
|||
# to bootstrap-tools; on cross-arm this stripping would break objects.
|
||||
if [ -z "$crossConfig" ]; then
|
||||
for i in "$out"/lib/*.a; do
|
||||
[ "$i" = "$out/lib/libm.a" ] || strip -S "$i"
|
||||
strip -S "$i"
|
||||
done
|
||||
fi
|
||||
|
||||
|
|
|
@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ coreutils ];
|
||||
|
||||
# Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
|
||||
doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux");
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
outputs = [ "out" "info" ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue