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

Updating glibc from 2.13 to 2.14.1

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30023
This commit is contained in:
Lluís Batlle i Rossell 2011-10-25 18:35:41 +00:00
parent 3fa51ac56a
commit 0b1f1a522c
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/libraries/glibc-2.13/builder.sh → pkgs/development/libraries/glibc-2.14/builder.sh
View File

8
pkgs/development/libraries/glibc-2.13/common.nix → pkgs/development/libraries/glibc-2.14/common.nix
View File

@ -11,7 +11,7 @@ cross :
let let
# For GNU/Hurd, see below. # For GNU/Hurd, see below.
version = if hurdHeaders != null then "20100512" else "2.13"; version = if hurdHeaders != null then "20100512" else "2.14.1";
needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsNative = stdenv.isMips || stdenv.isArm;
needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
@ -20,8 +20,8 @@ let
else needsPortsCross; else needsPortsCross;
srcPorts = fetchurl { srcPorts = fetchurl {
url = "mirror://gnu/glibc/glibc-ports-2.13.tar.bz2"; url = "mirror://gnu/glibc/glibc-ports-2.14.1.tar.bz2";
sha256 = "0npffql62m1xba15l1wkaqf2p0l2bvb33720gx28764jmq0la75i"; sha256 = "1acs4sd5mjzmssmd0md6dfqwnziph2am7v09mbnnd8aadpxhm0qw";
}; };
in in
@ -148,7 +148,7 @@ stdenv.mkDerivation ({
} }
else fetchurl { else fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
sha256 = "1cnv319ysc8nkwpqw6f6ymb6b8hbl0nyvyx48sddkrj50lmcjwq1"; sha256 = "0fsvf5d6sib483rp7asdy8hs0dysxqkrvw316c82hsxy7vxa51bf";
}; };
# `fetchurl' is a function and thus should not be passed to the # `fetchurl' is a function and thus should not be passed to the

0
pkgs/development/libraries/glibc-2.13/default.nix → pkgs/development/libraries/glibc-2.14/default.nix
View File

0
pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch → pkgs/development/libraries/glibc-2.14/glibc-elf-localscope.patch
View File

0
pkgs/development/libraries/glibc-2.13/info.nix → pkgs/development/libraries/glibc-2.14/info.nix
View File

0
pkgs/development/libraries/glibc-2.13/locales-builder.sh → pkgs/development/libraries/glibc-2.14/locales-builder.sh
View File

0
pkgs/development/libraries/glibc-2.13/locales.nix → pkgs/development/libraries/glibc-2.14/locales.nix
View File

0
pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch → pkgs/development/libraries/glibc-2.14/nix-locale-archive.patch
View File

0
pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch → pkgs/development/libraries/glibc-2.14/nss-skip-unavail.patch
View File

0
pkgs/development/libraries/glibc-2.13/rpcgen-path.patch → pkgs/development/libraries/glibc-2.14/rpcgen-path.patch
View File

14
pkgs/top-level/all-packages.nix
View File

@ -3384,7 +3384,7 @@ let
glfw = callPackage ../development/libraries/glfw { }; glfw = callPackage ../development/libraries/glfw { };
glibc = glibc213; glibc = glibc214;
glibc25 = callPackage ../development/libraries/glibc-2.5 { glibc25 = callPackage ../development/libraries/glibc-2.5 {
kernelHeaders = linuxHeaders_2_6_28; kernelHeaders = linuxHeaders_2_6_28;
@ -3408,15 +3408,15 @@ let
installLocales = getConfig [ "glibc" "locales" ] false; installLocales = getConfig [ "glibc" "locales" ] false;
}); });
glibc213 = (callPackage ../development/libraries/glibc-2.13 { glibc214 = (callPackage ../development/libraries/glibc-2.14 {
kernelHeaders = linuxHeaders; kernelHeaders = linuxHeaders;
installLocales = getConfig [ "glibc" "locales" ] false; installLocales = getConfig [ "glibc" "locales" ] false;
machHeaders = null; machHeaders = null;
hurdHeaders = null; hurdHeaders = null;
gccCross = null; gccCross = null;
}) // (if crossSystem != null then { hostDrv = glibc213Cross; } else {}); }) // (if crossSystem != null then { hostDrv = glibc214Cross; } else {});
glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.13) glibc214Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.14)
(let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu");
in ({ in ({
inherit stdenv fetchurl; inherit stdenv fetchurl;
@ -3431,7 +3431,7 @@ let
then { inherit machHeaders hurdHeaders mig fetchgit; } then { inherit machHeaders hurdHeaders mig fetchgit; }
else { })))); else { }))));
glibcCross = glibc213Cross; glibcCross = glibc214Cross;
# We can choose: # We can choose:
libcCrossChooser = name : if (name == "glibc") then glibcCross libcCrossChooser = name : if (name == "glibc") then glibcCross
@ -3446,9 +3446,9 @@ let
installLocales = getConfig [ "glibc" "locales" ] false; installLocales = getConfig [ "glibc" "locales" ] false;
}; };
glibcLocales = callPackage ../development/libraries/glibc-2.13/locales.nix { }; glibcLocales = callPackage ../development/libraries/glibc-2.14/locales.nix { };
glibcInfo = callPackage ../development/libraries/glibc-2.13/info.nix { }; glibcInfo = callPackage ../development/libraries/glibc-2.14/info.nix { };
glibc_multi = glibc_multi =
runCommand "${glibc.name}-multi" runCommand "${glibc.name}-multi"