From 054178e045dd820f3ce271513c73326f4140ea22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 22 Jun 2011 21:37:25 +0000
Subject: [PATCH] glibc: Update Hurd snapshot.

svn path=/nixpkgs/trunk/; revision=27525
---
 .../libraries/glibc-2.12/common.nix            | 10 ++++++----
 .../libraries/glibc-2.12/hurd-pthread.patch    | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/glibc-2.12/hurd-pthread.patch

diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix
index 0ffc8d7a0e89..d0d15b0f9f83 100644
--- a/pkgs/development/libraries/glibc-2.12/common.nix
+++ b/pkgs/development/libraries/glibc-2.12/common.nix
@@ -11,7 +11,7 @@ cross :
 
 let
   # For GNU/Hurd, see below.
-  version = if hurdHeaders != null then "20100512" else "2.12.2";
+  version = if hurdHeaders != null then "20110622" else "2.12.2";
 
   needsPortsNative = stdenv.isMips || stdenv.isArm;
   needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
@@ -74,7 +74,9 @@ stdenv.mkDerivation ({
     /* Allow nixos and nix handle the locale-archive. */
     ./nix-locale-archive.patch
 
-  ];
+  ]
+
+  ++ (stdenv.lib.optional (hurdHeaders != null) ./hurd-pthread.patch);
 
   postPatch = ''
     # Needed for glibc to build with the gnumake 3.82
@@ -142,8 +144,8 @@ stdenv.mkDerivation ({
       # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
       # See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
       url = "git://git.sv.gnu.org/hurd/glibc.git";
-      sha256 = "f3590a54a9d897d121f91113949edbaaf3e30cdeacbb8d0a44de7b6564f6643e";
-      rev = "df4c3faf0ccc848b5a8086c222bdb42679a9798f";
+      sha256 = "7b7bba027f17f30773ba73e97adb319c4bf75caab96e867d76ea33ae3b0f68ba";
+      rev = "239939de899afa3cfcd9f92e1dbc09225fc7f558";
     }
     else fetchurl {
       url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/glibc-2.12/hurd-pthread.patch b/pkgs/development/libraries/glibc-2.12/hurd-pthread.patch
new file mode 100644
index 000000000000..39e1d262b0ed
--- /dev/null
+++ b/pkgs/development/libraries/glibc-2.12/hurd-pthread.patch
@@ -0,0 +1,18 @@
+Don't include <pthread.h> since it's not needed and not available.
+This fixes a typo introduced in commit
+bcdced6aa67195b39d9d1871e624e2d009372a77 in branch `t/tls' of the
+Hurd's libc repo.
+
+diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h
+index 795588a..5827d8b 100644
+--- b/sysdeps/mach/hurd/i386/tls.h
++++ a/sysdeps/mach/hurd/i386/tls.h
+@@ -31,8 +31,6 @@
+ 
+ # ifndef __ASSEMBLER__
+ 
+-#include <pthread/pthread.h>
+-
+ /* Use i386-specific RPCs to arrange that %gs segment register prefix
+    addresses the TCB in each thread.  */
+ # include <mach/i386/mach_i386.h>