Author: ludo Date: Sat Jun 11 14:36:57 2011 New Revision: 27419 URL: https://svn.nixos.org/websvn/nix/?rev=27419&sc=1
Log: glibc/hurd: Add a patch for `dup3', which makes the Hurd patch applicable. Added: hydra-config/gnu/trunk/glibc/hurd-dup3-update.patch Modified: hydra-config/gnu/trunk/glibc/release.nix Added: hydra-config/gnu/trunk/glibc/hurd-dup3-update.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ hydra-config/gnu/trunk/glibc/hurd-dup3-update.patch Sat Jun 11 14:36:57 2011 (r27419) @@ -0,0 +1,37 @@ +Make `dup3' for GNU similar than that for GNU/Linux. +See <http://lists.gnu.org/archive/html/bug-hurd/2011-06/msg00013.html>. + +diff --git a/include/unistd.h b/include/unistd.h +index 1dbf170..b812dcc 100644 +--- a/include/unistd.h ++++ b/include/unistd.h +@@ -79,8 +79,7 @@ char *__canonicalize_directory_name_internal (__const char *__thisdir, + extern int __dup (int __fd); + extern int __dup2 (int __fd, int __fd2); + libc_hidden_proto (__dup2) +-extern int __dup3 (int __fd, int __fd2, int __flags); +-libc_hidden_proto (__dup3) ++libc_hidden_proto (dup3) + extern int __execve (__const char *__path, char *__const __argv[], + char *__const __envp[]); + extern long int __pathconf (__const char *__path, int __name); +diff --git a/sysdeps/mach/hurd/dup3.c b/sysdeps/mach/hurd/dup3.c +index 1e03eed..178ee16 100644 +--- a/sysdeps/mach/hurd/dup3.c ++++ b/sysdeps/mach/hurd/dup3.c +@@ -28,7 +28,7 @@ + open on the same file as FD is, and setting FD2's flags according to FLAGS. + Return FD2 or -1. */ + int +-__dup3 (int fd, int fd2, int flags) ++dup3 (int fd, int fd2, int flags) + { + struct hurd_fd *d; + +@@ -137,5 +137,4 @@ __dup3 (int fd, int fd2, int flags) + + return fd2; + } +-libc_hidden_def (__dup3) +-weak_alias (__dup3, dup3) ++libc_hidden_def (dup3) Modified: hydra-config/gnu/trunk/glibc/release.nix ============================================================================== --- hydra-config/gnu/trunk/glibc/release.nix Sat Jun 11 14:36:51 2011 (r27418) +++ hydra-config/gnu/trunk/glibc/release.nix Sat Jun 11 14:36:57 2011 (r27419) @@ -141,7 +141,8 @@ name = "glibc-hurd-patches"; src = glibcHurd; buildInputs = with pkgs; [ git gitAndTools.topGit ]; - phases = "unpackPhase buildPhase"; + phases = "unpackPhase patchPhase buildPhase"; + patches = [ ./hurd-dup3-update.patch ]; buildPhase = # Assume Hydra called `nix-prefetch-git', which ran # "tg remote --populate origin" (Nixpkgs r26305). _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
