guix-commits
[Top][All Lists]
Advanced

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

01/02: Revert "syscalls: Adjust for glibc 2.34 and later."


From: guix-commits
Subject: 01/02: Revert "syscalls: Adjust for glibc 2.34 and later."
Date: Mon, 7 Nov 2022 16:29:46 -0500 (EST)

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

commit c9984bfc508e244cbb70ca9db01ff988237b5082
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Nov 7 22:25:28 2022 +0100

    Revert "syscalls: Adjust for glibc 2.34 and later."
    
    This reverts commit 3c8b6fd94ceb1e898216929e8768fb518dbf1de9, which
    would break bindings on glibc < 2.34 where those symbols are in
    "libutil.so".
---
 guix/build/syscalls.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 0f939c23ad..7842b0a9fc 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -2321,7 +2321,8 @@ always a positive integer."
   (terminal-dimension window-size-rows port (const 25)))
 
 (define openpty
-  (let ((proc (syscall->procedure int "openpty" '(* * * * *))))
+  (let ((proc (syscall->procedure int "openpty" '(* * * * *)
+                                  #:library "libutil")))
     (lambda ()
       "Return two file descriptors: one for the pseudo-terminal control side,
 and one for the controlled side."
@@ -2342,7 +2343,8 @@ and one for the controlled side."
           (values (* head) (* inferior)))))))
 
 (define login-tty
-  (let* ((proc (syscall->procedure int "login_tty" (list int))))
+  (let* ((proc (syscall->procedure int "login_tty" (list int)
+                                   #:library "libutil")))
     (lambda (fd)
       "Make FD the controlling terminal of the current process (with the
 TIOCSCTTY ioctl), redirect standard input, standard output and standard error



reply via email to

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