GNU libc: Update the Hurd port.

svn path=/nixpkgs/trunk/; revision=32630

+4 -25
+4 -5
pkgs/development/libraries/glibc-2.12/common.nix
··· 12 12 13 13 let 14 14 # For GNU/Hurd, see below. 15 - version = if hurdHeaders != null then "20120221" else "2.12.2"; 15 + version = if hurdHeaders != null then "20120223" else "2.12.2"; 16 16 17 17 needsPortsNative = stdenv.isMips || stdenv.isArm; 18 18 needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; ··· 75 75 76 76 /* Allow nixos and nix handle the locale-archive. */ 77 77 ./nix-locale-archive.patch 78 - ] 79 - ++ (stdenv.lib.optional (hurdHeaders != null) ./hurd-sigstate-functions.patch); 78 + ]; 80 79 81 80 postPatch = '' 82 81 # Needed for glibc to build with the gnumake 3.82 ··· 144 143 # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch. 145 144 # See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>. 146 145 url = "git://git.sv.gnu.org/hurd/glibc.git"; 147 - sha256 = "fbc053f23167059af414ae1ba9a65931a9d9afaf7d2efb9eba3e258757d12f7d"; 148 - rev = "b29b3d0ae35be390cab59e4798cbaf9b45fb06e3"; 146 + sha256 = "cecec9dd5a2bafc875c56b058b6d7628a22b250b53747513dec304f31ffdb82d"; 147 + rev = "d3cdecf18e6550b0984a42b43ed48c5fb26501e1"; 149 148 } 150 149 else fetchurl { 151 150 url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
-20
pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch
··· 1 - This patch adds a GNU ld version script entry for the `_hurd_sigstate_*' 2 - functions that were introduced to support SA_SIGINFO. A similar patch 3 - should be applied upstream soon. 4 - 5 - diff --git a/hurd/Versions b/hurd/Versions 6 - index 83c8ab1..295cfda 100644 7 - --- a/hurd/Versions 8 - +++ b/hurd/Versions 9 - @@ -156,6 +156,11 @@ libc { 10 - # functions used in macros & inline functions 11 - __errno_location; 12 - } 13 - + GLIBC_2.13 { 14 - + # functions introduced for SA_SIGINFO support and referenced from 15 - + # <hurd/signal.h> 16 - + _hurd_sigstate_*; 17 - + } 18 - 19 - %if !SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) 20 - HURD_CTHREADS_0.3 {