[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);
- branch core-updates updated (13f5a0d -> 927c52c), Mark H. Weaver, 2018/03/25
- 02/13: gnu: binutils-vc4: Use invoke., Mark H. Weaver, 2018/03/25
- 03/13: gnu: mkfontdir: Return #t from all phases., Mark H. Weaver, 2018/03/25
- 07/13: gnu: wireless-regdb: Inhibit gzip timestamp., Mark H. Weaver, 2018/03/25
- 01/13: gnu: bdb: Use invoke., Mark H. Weaver, 2018/03/25
- 06/13: gnu: xf86-video-intel: Fix error during bootstrap., Mark H. Weaver, 2018/03/25
- 08/13: gnu: asciidoc: Restore custom 'bootstrap' phase., Mark H. Weaver, 2018/03/25
- 09/13: gnu: crda: Inhibit gzip timestamp., Mark H. Weaver, 2018/03/25
- 10/13: gnu: make-bootstrap: Adapt glibc-bootstrap-system.patch for glibc-2.27.,
Mark H. Weaver <=
- 05/13: gnu: shadow: Return #t from all phases., Mark H. Weaver, 2018/03/25
- 11/13: gnu: perl-boot0: Return #t from all phases., Mark H. Weaver, 2018/03/25
- 12/13: gnu: libva: Return #t from all phases., Mark H. Weaver, 2018/03/25
- 13/13: gnu: libselinux: Use invoke., Mark H. Weaver, 2018/03/25
- 04/13: gnu: pulseaudio: Fix build with glibc-2.27., Mark H. Weaver, 2018/03/25