diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-06-23 21:14:35 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-06-23 21:14:35 +0000 |
| commit | ad3cea4fb185a362ff8d81e3bf936dc199593ccf (patch) | |
| tree | 10274260885626eb0863e290fe3cf63e1775168c /pkgs | |
| parent | a0982e02fd33e53b35a6496c20945bf67018ff5a (diff) | |
| download | nixlib-ad3cea4fb185a362ff8d81e3bf936dc199593ccf.tar nixlib-ad3cea4fb185a362ff8d81e3bf936dc199593ccf.tar.gz nixlib-ad3cea4fb185a362ff8d81e3bf936dc199593ccf.tar.bz2 nixlib-ad3cea4fb185a362ff8d81e3bf936dc199593ccf.tar.lz nixlib-ad3cea4fb185a362ff8d81e3bf936dc199593ccf.tar.xz nixlib-ad3cea4fb185a362ff8d81e3bf936dc199593ccf.tar.zst nixlib-ad3cea4fb185a362ff8d81e3bf936dc199593ccf.zip | |
glibc: Update Hurd snapshot.
svn path=/nixpkgs/trunk/; revision=27536
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/glibc-2.12/common.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc-2.12/hurd-pthread.patch | 18 |
2 files changed, 4 insertions, 25 deletions
diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix index d0d15b0f9f83..a83aeeab7f3a 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 "20110622" else "2.12.2"; + version = if hurdHeaders != null then "20110623" else "2.12.2"; needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; @@ -73,10 +73,7 @@ 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 @@ -144,8 +141,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 = "7b7bba027f17f30773ba73e97adb319c4bf75caab96e867d76ea33ae3b0f68ba"; - rev = "239939de899afa3cfcd9f92e1dbc09225fc7f558"; + sha256 = "e51c6b0bb8544ee4547fda22272bfa6a23677655d15da3c041be6e820f37f844"; + rev = "05862f9210fb029df3773ef004af954461f07478"; } 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 deleted file mode 100644 index 39e1d262b0ed..000000000000 --- a/pkgs/development/libraries/glibc-2.12/hurd-pthread.patch +++ /dev/null @@ -1,18 +0,0 @@ -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> |