public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-revert "Merge: glibc: 2.24 -> 2.25"

Browse Source 
This reverts commit 55cc7700e968001c9ac79190fbcf25ed3620680a.
I hope most problems have been solved.  /cc #22874.
This commit is contained in:
Vladimír Čunát 2017-02-20 21:16:41 +01:00
parent 0ff2179e0f
commit 09d02f72f6
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/fontconfig/default.nix
View File

@ -28,7 +28,17 @@ stdenv.mkDerivation rec {
src = ./config-compat.patch; src = ./config-compat.patch;
inherit configVersion; 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 outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config

6
pkgs/development/libraries/glibc/common.nix
View File

@ -10,8 +10,8 @@ cross:
, preConfigure ? "", ... }@args: , preConfigure ? "", ... }@args:
let let
version = "2.24"; version = "2.25";
sha256 = "1ghzp41ryvsqxn4rhrm8r25wc33m2jf8zrcc1pj3jxyk8ad9a0by"; sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0";
in in
assert cross != null -> gccCross != null; assert cross != null -> gccCross != null;
@ -138,7 +138,7 @@ stdenv.mkDerivation ({
lib.optionalString (cross != null) "-${cross.config}"; lib.optionalString (cross != null) "-${cross.config}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; url = "mirror://gnu/glibc/glibc-${version}.tar.xz";
inherit sha256; inherit sha256;
}; };

2
pkgs/development/libraries/glibc/default.nix
View File

@ -81,7 +81,7 @@ in
# to bootstrap-tools; on cross-arm this stripping would break objects. # to bootstrap-tools; on cross-arm this stripping would break objects.
if [ -z "$crossConfig" ]; then if [ -z "$crossConfig" ]; then
for i in "$out"/lib/*.a; do for i in "$out"/lib/*.a; do
strip -S "$i" [ "$i" = "$out/lib/libm.a" ] || strip -S "$i"
done done
fi fi

3
pkgs/tools/misc/findutils/default.nix
View File

@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
doCheck = !stdenv.isDarwin; # Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux");
outputs = [ "out" "info" ]; outputs = [ "out" "info" ];