glibc 2.12.1.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23282
This commit is contained in:
Ludovic Courtès 2010-08-20 15:26:50 +00:00
parent 58b1dfe0fe
commit 87a62c6369
13 changed files with 7 additions and 7 deletions

View file

@ -11,7 +11,7 @@ cross :
let
# For GNU/Hurd, see below.
version = if hurdHeaders != null then "20100512" else "2.11.2";
version = if hurdHeaders != null then "20100512" else "2.12.1";
in
assert (cross != null) -> (gccCross != null);
@ -128,11 +128,11 @@ stdenv.mkDerivation ({
}
else fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
sha256 = "04w74879psq961cas1amidkg8fc1h6r9yj3plfr33v9y6vp7db62";
sha256 = "01vlr473skl08xpcjz0b4lw23lsnskf5kx9s8nxwa4mwa9f137vm";
};
srcPorts = fetchurl {
url = "mirror://gnu/glibc/glibc-ports-2.11.tar.bz2";
url = "mirror://gnu/glibc/glibc-ports-2.11.tar.bz2"; # FIXME: 2.12.1 unavailable.
sha256 = "12b53f5k4gcr8rr1kg2ycf2701rygqsyf9r8gz4j3l9flaqi5liq";
};

View file

@ -2821,7 +2821,7 @@ let
glfw = callPackage ../development/libraries/glfw { };
glibc = glibc211;
glibc = glibc212;
glibc25 = callPackage ../development/libraries/glibc-2.5 {
kernelHeaders = linuxHeaders;
@ -2845,7 +2845,7 @@ let
installLocales = getPkgConfig "glibc" "locales" false;
});
glibc211 = callPackage ../development/libraries/glibc-2.11 {
glibc212 = callPackage ../development/libraries/glibc-2.12 {
kernelHeaders = linuxHeaders;
installLocales = getPkgConfig "glibc" "locales" false;
machHeaders = null;
@ -2853,7 +2853,7 @@ let
gccCross = null;
};
glibc211Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11)
glibc212Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.12)
(let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu");
in ({
inherit stdenv fetchurl;
@ -2868,7 +2868,7 @@ let
then { inherit machHeaders hurdHeaders mig fetchgit; }
else { }))));
glibcCross = glibc211Cross;
glibcCross = glibc212Cross;
# We can choose:
libcCrossChooser = name : if (name == "glibc") then glibcCross