alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* Glibc 2.11.2.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22967
This commit is contained in:
Eelco Dolstra 2010-08-05 16:51:16 +00:00
parent 5119fac40e
commit 39a2523e79
2 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/glibc-2.11/common.nix
View file

@ -11,9 +11,7 @@ cross :
let let
# For GNU/Hurd, see below. # For GNU/Hurd, see below.
date = "20100512"; version = if hurdHeaders != null then "20100512" else "2.11.2";
rev = "df4c3faf0ccc848b5a8086c222bdb42679a9798f";
version = if hurdHeaders != null then date else "2.11.1";
in in
assert (cross != null) -> (gccCross != null); assert (cross != null) -> (gccCross != null);
@ -123,11 +121,11 @@ stdenv.mkDerivation ({
# See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>. # See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
url = "git://git.sv.gnu.org/hurd/glibc.git"; url = "git://git.sv.gnu.org/hurd/glibc.git";
sha256 = "f3590a54a9d897d121f91113949edbaaf3e30cdeacbb8d0a44de7b6564f6643e"; sha256 = "f3590a54a9d897d121f91113949edbaaf3e30cdeacbb8d0a44de7b6564f6643e";
inherit rev; rev = "df4c3faf0ccc848b5a8086c222bdb42679a9798f";
} }
else fetchurl { else fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.bz2"; url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
sha256 = "18azb6518ryqhkfmddr25p0h1s2msrmx7dblij58sjlnzh61vq34"; sha256 = "04w74879psq961cas1amidkg8fc1h6r9yj3plfr33v9y6vp7db62";
}; };
srcPorts = fetchurl { srcPorts = fetchurl {

42
pkgs/development/libraries/glibc-2.11/nss-skip-unavail.patch
View file

@ -1,25 +1,21 @@
diff -rc glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c diff -ru glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c glibc-2.11.2/sysdeps/posix/getaddrinfo.c
*** glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c 2008-07-30 21:14:22.000000000 +0200 --- glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c 2010-05-19 22:38:20.000000000 +0200
--- glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c 2008-12-10 11:39:32.000000000 +0100 +++ glibc-2.11.2/sysdeps/posix/getaddrinfo.c 2010-08-05 18:39:54.259556327 +0200
*************** @@ -505,8 +505,6 @@
*** 505,512 **** int no_data = 0;
int no_data = 0; int no_inet6_data = 0;
int no_inet6_data = 0; service_user *nip = NULL;
service_user *nip = NULL; - enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
- enum nss_status inet6_status = NSS_STATUS_UNAVAIL; - enum nss_status status = NSS_STATUS_UNAVAIL;
- enum nss_status status = NSS_STATUS_UNAVAIL; int no_more;
int no_more; int old_res_options;
int old_res_options;
@@ -702,6 +700,8 @@
--- 505,510 ----
*************** while (!no_more)
*** 702,707 **** {
--- 700,707 ----
while (!no_more)
{
+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL; + enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
+ enum nss_status status = NSS_STATUS_UNAVAIL; + enum nss_status status = NSS_STATUS_UNAVAIL;
nss_gethostbyname4_r fct4 no_data = 0;
= __nss_lookup_function (nip, "gethostbyname4_r"); nss_gethostbyname4_r fct4
if (fct4 != NULL) = __nss_lookup_function (nip, "gethostbyname4_r");