From db418fce3d159391a7f2baf2b765e5798908c696 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 29 Dec 2012 00:48:14 +0100 Subject: [PATCH] glibc: Update to 2.17 Note that glibc-ports is now part of the main glibc tarball. --- .../libraries/glibc/{2.16 => 2.17}/builder.sh | 0 .../libraries/glibc/{2.16 => 2.17}/common.nix | 18 ++---------------- .../libraries/glibc/{2.16 => 2.17}/default.nix | 0 .../dont-use-system-ld-so-cache.patch | 0 .../{2.16 => 2.17}/glibc-elf-localscope.patch | 0 .../libraries/glibc/{2.16 => 2.17}/info.nix | 0 .../glibc/{2.16 => 2.17}/locales-builder.sh | 0 .../libraries/glibc/{2.16 => 2.17}/locales.nix | 0 .../{2.16 => 2.17}/nix-locale-archive.patch | 0 .../{2.16 => 2.17}/nss-skip-unavail.patch | 0 .../glibc/{2.16 => 2.17}/rpcgen-path.patch | 0 pkgs/top-level/all-packages.nix | 4 ++-- 12 files changed, 4 insertions(+), 18 deletions(-) rename pkgs/development/libraries/glibc/{2.16 => 2.17}/builder.sh (100%) rename pkgs/development/libraries/glibc/{2.16 => 2.17}/common.nix (91%) rename pkgs/development/libraries/glibc/{2.16 => 2.17}/default.nix (100%) rename pkgs/development/libraries/glibc/{2.16 => 2.17}/dont-use-system-ld-so-cache.patch (100%) rename pkgs/development/libraries/glibc/{2.16 => 2.17}/glibc-elf-localscope.patch (100%) rename pkgs/development/libraries/glibc/{2.16 => 2.17}/info.nix (100%) rename pkgs/development/libraries/glibc/{2.16 => 2.17}/locales-builder.sh (100%) rename pkgs/development/libraries/glibc/{2.16 => 2.17}/locales.nix (100%) rename pkgs/development/libraries/glibc/{2.16 => 2.17}/nix-locale-archive.patch (100%) rename pkgs/development/libraries/glibc/{2.16 => 2.17}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/glibc/{2.16 => 2.17}/rpcgen-path.patch (100%) diff --git a/pkgs/development/libraries/glibc/2.16/builder.sh b/pkgs/development/libraries/glibc/2.17/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc/2.16/builder.sh rename to pkgs/development/libraries/glibc/2.17/builder.sh diff --git a/pkgs/development/libraries/glibc/2.16/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix similarity index 91% rename from pkgs/development/libraries/glibc/2.16/common.nix rename to pkgs/development/libraries/glibc/2.17/common.nix index ea54b45a50de..ccdae6200e53 100644 --- a/pkgs/development/libraries/glibc/2.16/common.nix +++ b/pkgs/development/libraries/glibc/2.17/common.nix @@ -11,24 +11,12 @@ cross: , preConfigure ? "", ... }@args: let - version = "2.16.0"; - needsPortsNative = stdenv.isMips || stdenv.isArm; - needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; - needsPorts = - if stdenv.cross or null != null && hurdHeaders == null then true - else if cross == null then needsPortsNative - else needsPortsCross; - - srcPorts = fetchurl { - url = "mirror://gnu/glibc/glibc-ports-${version}.tar.bz2"; - sha256 = "0qw4n71rqykl83ybq0c92w1n8afsx079sw3hn5nyib5nw6iphrfm"; - }; + version = "2.17"; in assert cross != null -> gccCross != null; - assert mig != null -> machHeaders != null; assert machHeaders != null -> hurdHeaders != null; assert hurdHeaders != null -> libpthreadHeaders != null; @@ -151,7 +139,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; - sha256 = "0vlz4x6cgz7h54qq4528q526qlhnsjzbsvgc4iizn76cb0bfanx7"; + sha256 = "0ym3zk9ii64279wgw7pw9xkbxczy2ci7ka6mnfs05rhlainhicm3"; }; # Remove absolute paths from `configure' & co.; build out-of-tree. @@ -163,8 +151,6 @@ stdenv.mkDerivation ({ sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" done - ${if needsPorts then "tar xvf ${srcPorts}" else ""} - mkdir ../build cd ../build diff --git a/pkgs/development/libraries/glibc/2.16/default.nix b/pkgs/development/libraries/glibc/2.17/default.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.16/default.nix rename to pkgs/development/libraries/glibc/2.17/default.nix diff --git a/pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/2.17/dont-use-system-ld-so-cache.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.16/dont-use-system-ld-so-cache.patch rename to pkgs/development/libraries/glibc/2.17/dont-use-system-ld-so-cache.patch diff --git a/pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.17/glibc-elf-localscope.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.16/glibc-elf-localscope.patch rename to pkgs/development/libraries/glibc/2.17/glibc-elf-localscope.patch diff --git a/pkgs/development/libraries/glibc/2.16/info.nix b/pkgs/development/libraries/glibc/2.17/info.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.16/info.nix rename to pkgs/development/libraries/glibc/2.17/info.nix diff --git a/pkgs/development/libraries/glibc/2.16/locales-builder.sh b/pkgs/development/libraries/glibc/2.17/locales-builder.sh similarity index 100% rename from pkgs/development/libraries/glibc/2.16/locales-builder.sh rename to pkgs/development/libraries/glibc/2.17/locales-builder.sh diff --git a/pkgs/development/libraries/glibc/2.16/locales.nix b/pkgs/development/libraries/glibc/2.17/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.16/locales.nix rename to pkgs/development/libraries/glibc/2.17/locales.nix diff --git a/pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.17/nix-locale-archive.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.16/nix-locale-archive.patch rename to pkgs/development/libraries/glibc/2.17/nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.16/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc/2.16/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.17/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.16/rpcgen-path.patch rename to pkgs/development/libraries/glibc/2.17/rpcgen-path.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 968418af9289..9216f446e0af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3624,7 +3624,7 @@ let glfw = callPackage ../development/libraries/glfw { }; - glibc = glibc216; + glibc = glibc217; glibcCross = glibc213Cross; @@ -3649,7 +3649,7 @@ let inherit fetchgit; })); - glibc216 = callPackage ../development/libraries/glibc/2.16 { + glibc217 = callPackage ../development/libraries/glibc/2.17 { kernelHeaders = linuxHeaders; installLocales = config.glibc.locales or false; machHeaders = null;