summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2022-11-07 22:25:28 +0100
committerLudovic Courtès <ludo@gnu.org>2022-11-07 22:25:33 +0100
commitc9984bfc508e244cbb70ca9db01ff988237b5082 (patch)
tree2d25fe99c4a1234629dfdcc9c21ec148b97c1cf4
parentaf4f71318a56fd3b42910923cbf7cff71be59b38 (diff)
downloadguix-c9984bfc508e244cbb70ca9db01ff988237b5082.tar.gz
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".
-rw-r--r--guix/build/syscalls.scm6
1 files 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