Author: ludo
Date: Thu Feb 23 00:01:19 2012
New Revision: 32497
URL: https://nixos.org/websvn/nix/?rev=32497&sc=1
Log:
GNU libc: Update the Hurd port.
Added:
nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.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 Feb
22 22:42:16 2012 (r32496)
+++ nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/common.nix Thu Feb
23 00:01:19 2012 (r32497)
@@ -12,7 +12,7 @@
let
# For GNU/Hurd, see below.
- version = if hurdHeaders != null then "20111025" else "2.12.2";
+ version = if hurdHeaders != null then "20120221" else "2.12.2";
needsPortsNative = stdenv.isMips || stdenv.isArm;
needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
@@ -75,7 +75,8 @@
/* Allow nixos and nix handle the locale-archive. */
./nix-locale-archive.patch
- ];
+ ]
+ ++ (stdenv.lib.optional (hurdHeaders != null)
./hurd-sigstate-functions.patch);
postPatch = ''
# Needed for glibc to build with the gnumake 3.82
@@ -143,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 =
"3fb3dd7030a4b6d3e144fa94c32a0c4f46f17f94e2dfbc6bef41cfc3198725ca";
- rev = "d740cf9d201dc9ecb0335b0a585828dea9cce793";
+ sha256 =
"fbc053f23167059af414ae1ba9a65931a9d9afaf7d2efb9eba3e258757d12f7d";
+ rev = "b29b3d0ae35be390cab59e4798cbaf9b45fb06e3";
}
else fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
Added:
nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch
Thu Feb 23 00:01:19 2012 (r32497)
@@ -0,0 +1,20 @@
+This patch adds a GNU ld version script entry for the `_hurd_sigstate_*'
+functions that were introduced to support SA_SIGINFO. A similar patch
+should be applied upstream soon.
+
+diff --git a/hurd/Versions b/hurd/Versions
+index 83c8ab1..295cfda 100644
+--- a/hurd/Versions
++++ b/hurd/Versions
+@@ -156,6 +156,11 @@ libc {
+ # functions used in macros & inline functions
+ __errno_location;
+ }
++ GLIBC_2.13 {
++ # functions introduced for SA_SIGINFO support and referenced from
++ # <hurd/signal.h>
++ _hurd_sigstate_*;
++ }
+
+ %if !SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
+ HURD_CTHREADS_0.3 {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
