Author: ludo
Date: Wed Jun 22 21:37:25 2011
New Revision: 27525
URL: https://svn.nixos.org/websvn/nix/?rev=27525&sc=1
Log:
glibc: Update Hurd snapshot.
Added:
nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/hurd-pthread.patch
Modified:
nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/common.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/common.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/common.nix Wed Jun
22 21:15:35 2011 (r27524)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/common.nix Wed Jun
22 21:37:25 2011 (r27525)
@@ -11,7 +11,7 @@
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 @@
/* 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 @@
# 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";
Added: nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/hurd-pthread.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/hurd-pthread.patch
Wed Jun 22 21:37:25 2011 (r27525)
@@ -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>
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
