* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=33971

pkgs/development/libraries/glibc/2.13/common.nix

@@ -16,7 +16,8 @@ let
 
   needsPortsNative = stdenv.isMips || stdenv.isArm;
   needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
-  needsPorts = if (stdenv ? cross) && stdenv.cross != null then true
+  needsPorts =
+    if (stdenv ? cross) && stdenv.cross != null && hurdHeaders == null then true
     else if cross == null then needsPortsNative
     else needsPortsCross;
 
@@ -108,7 +109,7 @@ stdenv.mkDerivation ({
     (if cross.float == "soft" then "--without-fp" else "--with-fp")
     "--enable-kernel=2.6.0"
     "--with-__thread"
-  ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [
+  ] ++ stdenv.lib.optionals stdenv.isArm [
     "--host=arm-linux-gnueabi"
     "--build=arm-linux-gnueabi"
     "--without-fp"
@@ -184,7 +185,8 @@ stdenv.mkDerivation ({
 
   meta = {
     homepage = http://www.gnu.org/software/libc/;
-    description = "The GNU C Library";
+    description = "The GNU C Library"
+      + stdenv.lib.optionalString (hurdHeaders != null) ", for GNU/Hurd";
 
     longDescription =
       '' Any Unix-like operating system needs a C library: the library which

pkgs/development/libraries/glibc/2.13/default.nix

@@ -14,7 +14,9 @@ let
   cross = if gccCross != null then gccCross.target else null;
 in
   build cross ({
-    name = "glibc${if debugSymbols then "-debug" else ""}";
+    name = "glibc"
+      + stdenv.lib.optionalString (hurdHeaders != null) "-hurd"
+      + stdenv.lib.optionalString debugSymbols "-debug";
 
     inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries
       gccCross;

pkgs/development/libraries/glibc/2.14/common.nix

@@ -108,7 +108,7 @@ stdenv.mkDerivation ({
     (if cross.float == "soft" then "--without-fp" else "--with-fp")
     "--enable-kernel=2.6.0"
     "--with-__thread"
-  ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [
+  ] ++ stdenv.lib.optionals stdenv.isArm [
     "--host=arm-linux-gnueabi"
     "--build=arm-linux-gnueabi"
     "--without-fp"

pkgs/development/libraries/glibc/2.9/default.nix

@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     "--enable-kernel=2.6.0"
     "--without-fp"
     "--with-__thread"
-  ] ++ (if (stdenv.system == "armv5tel-linux") then [
+  ] ++ (if stdenv.isArm then [
     "--host=arm-linux-gnueabi"
     "--build=arm-linux-gnueabi"
     "--without-fp"

pkgs/development/libraries/glibc/2.9/headers.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     "--disable-sanity-checks"
     "--enable-hacker-mode"
     (if profilingLibraries then "--enable-profile" else "--disable-profile")
-  ] ++ (if (stdenv.system == "armv5tel-linux") then [
+  ] ++ (if stdenv.isArm then [
     "--host=arm-linux-gnueabi"
     "--build=arm-linux-gnueabi"
     "--without-fp"

pkgs/development/libraries/glibc/2.9/locales.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     "--enable-add-ons"
     "--without-headers"
     "--disable-profile"
-  ] ++ (if (stdenv.system == "armv5tel-linux") then [
+  ] ++ (if stdenv.isArm then [
     "--host=arm-linux-gnueabi"
     "--build=arm-linux-gnueabi"
     "--without-fp"