From 8910d4e646118eafe2131d0bf794c04ac7fc6a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 1 Dec 2009 21:33:11 +0000
Subject: [PATCH] Adding ports to glibc-2.11. Making glibc-2.11 the default in
 cross-compiling and also for the native armv5tel.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18744
---
 .../libraries/glibc-2.11/common.nix           | 12 +++++++++--
 .../libraries/glibc-2.11/default.nix          |  6 +++---
 pkgs/top-level/all-packages.nix               | 21 ++++++++-----------
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/glibc-2.11/common.nix b/pkgs/development/libraries/glibc-2.11/common.nix
index 4d4438a9c42b..ed667be10ef4 100644
--- a/pkgs/development/libraries/glibc-2.11/common.nix
+++ b/pkgs/development/libraries/glibc-2.11/common.nix
@@ -1,8 +1,8 @@
 /* Build configuration used to build glibc, Info files, and locale
    information.  */
 
-{ name, fetchurl, stdenv, installLocales ? false
-, cross ? null, gccCross ? null, kernelHeaders ? null
+cross : { name, fetchurl, stdenv, installLocales ? false
+, gccCross ? null, kernelHeaders ? null
 , profilingLibraries ? false, meta, ... }@args :
 
 let version = "2.11";
@@ -107,6 +107,11 @@ stdenv.mkDerivation ({
     sha256 = "0b6nbr89qmqcvzz26ggnw7gcxhvnzbc8z299h12wqjmcix4hxwcy";
   };
 
+  srcPorts = fetchurl {
+    url = "mirror://gnu/glibc/glibc-ports-${version}.tar.bz2";
+    sha256 = "12b53f5k4gcr8rr1kg2ycf2701rygqsyf9r8gz4j3l9flaqi5liq";
+  };
+
   # `fetchurl' is a function and thus should not be passed to the
   # `derivation' primitive.
   fetchurl = null;
@@ -119,6 +124,9 @@ stdenv.mkDerivation ({
         # built yet in the bootstrap.
         sed -i "$i" -e "s^/bin/pwd^$PWD_P^g"
     done
+
+    tar xvjf "$srcPorts"
+
     mkdir ../build
     cd ../build
 
diff --git a/pkgs/development/libraries/glibc-2.11/default.nix b/pkgs/development/libraries/glibc-2.11/default.nix
index 48f1a12c058a..49ee71af5060 100644
--- a/pkgs/development/libraries/glibc-2.11/default.nix
+++ b/pkgs/development/libraries/glibc-2.11/default.nix
@@ -8,11 +8,11 @@ let
   build = import ./common.nix;
   cross = if gccCross != null then gccCross.target else null;
 in
-  build ({
+  build cross ({
     name = "glibc";
 
     inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries
-      cross;
+      gccCross;
 
     builder = ./builder.sh;
 
@@ -45,7 +45,7 @@ EOF
         export AR="$crossConfig-ar"
         export RANLIB="$crossConfig-ranlib"
 
-        dontStrip = 1
+        dontStrip=1
       '';
    }
    else {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa41f8c43615..215d96c92a81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3429,8 +3429,7 @@ let
         haveBrokenRedHatKernel = haveRedHatKernel && getConfig ["brokenRedHatKernel"] false;
     in
     useFromStdenv "glibc" (if haveBrokenRedHatKernel then glibc25 else
-      # glibc211 does not have ports still.
-      if (system == "armv5tel-linux") then glibc210 else glibc211);
+        glibc211);
 
   glibc25 = import ../development/libraries/glibc-2.5 {
     inherit fetchurl stdenv kernelHeaders;
@@ -3454,6 +3453,11 @@ let
     installLocales = getPkgConfig "glibc" "locales" false;
   });
 
+  glibc210 = makeOverridable (import ../development/libraries/glibc-2.10) {
+    inherit fetchurl stdenv kernelHeaders;
+    installLocales = getPkgConfig "glibc" "locales" false;
+  };
+
   glibc210Cross = cross: forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.10) {
     inherit stdenv fetchurl;
     gccCross = gccCrossStageStatic cross;
@@ -3461,26 +3465,19 @@ let
     installLocales = getPkgConfig "glibc" "locales" false;
   });
 
-  glibcCross = cross: glibc210Cross cross;
-
-  glibc210 = makeOverridable (import ../development/libraries/glibc-2.10) {
-    inherit fetchurl stdenv kernelHeaders;
-    installLocales = getPkgConfig "glibc" "locales" false;
-  };
-
   glibc211 = makeOverridable (import ../development/libraries/glibc-2.11) {
     inherit fetchurl stdenv kernelHeaders;
     installLocales = getPkgConfig "glibc" "locales" false;
   };
 
-  glibc211CrossReal = cross : forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11) {
-    inherit stdenv fetchurl cross;
+  glibc211Cross = cross : forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11) {
+    inherit stdenv fetchurl;
     gccCross = gccCrossStageStatic cross;
     kernelHeaders = kernelHeadersCross cross;
     installLocales = getPkgConfig "glibc" "locales" false;
   });
 
-  glibc211Cross = cross : forceBuildDrv (glibc211CrossReal cross);
+  glibcCross = cross: glibc211Cross cross;
 
   eglibc = import ../development/libraries/eglibc {
     inherit fetchsvn stdenv kernelHeaders;