guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

10/13: gnu: make-bootstrap: Adapt glibc-bootstrap-system.patch for glibc


From: Mark H. Weaver
Subject: 10/13: gnu: make-bootstrap: Adapt glibc-bootstrap-system.patch for glibc-2.27.
Date: Sun, 25 Mar 2018 05:03:17 -0400 (EDT)

mhw pushed a commit to branch core-updates
in repository guix.

commit 06b1d6954aa6cf7123745136df41bc949b591f1c
Author: Mark H Weaver <address@hidden>
Date:   Sun Mar 25 02:31:49 2018 -0400

    gnu: make-bootstrap: Adapt glibc-bootstrap-system.patch for glibc-2.27.
    
    * gnu/packages/patches/glibc-bootstrap-system.patch: Adapt for glibc-2.27.
---
 gnu/packages/patches/glibc-bootstrap-system.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/patches/glibc-bootstrap-system.patch 
b/gnu/packages/patches/glibc-bootstrap-system.patch
index 2f8e7da..addeed6 100644
--- a/gnu/packages/patches/glibc-bootstrap-system.patch
+++ b/gnu/packages/patches/glibc-bootstrap-system.patch
@@ -15,16 +15,16 @@ instead uses the hard-coded absolute file name of `bash'.
      }
    else if (pid < (pid_t) 0)
 
---- b/libio/iopopen.c  2012-06-30 21:12:34.000000000 +0200
-+++ b/libio/iopopen.c  2012-12-19 12:52:29.000000000 +0100
-@@ -226,7 +226,7 @@ _IO_new_proc_open (fp, command, mode)
-           _IO_close (fd);
+--- a/libio/iopopen.c
++++ b/libio/iopopen.c
+@@ -145,7 +145,7 @@ _IO_new_proc_open (fp, command, mode)
+           __close_nocancel (fd);
        }
  
--      _IO_execl ("/bin/sh", "sh", "-c", command, (char *) 0);
+-      execl ("/bin/sh", "sh", "-c", command, (char *) 0);
 +      execlp ("sh", "sh", "-c", command, (char *) 0);
-       _IO__exit (127);
+       _exit (127);
      }
-   _IO_close (child_end);
+   __close_nocancel (child_end);
 
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]