From c9984bfc508e244cbb70ca9db01ff988237b5082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 7 Nov 2022 22:25:28 +0100 Subject: [PATCH] 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 @@ (define* (terminal-rows #:optional (port (current-output-port))) (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 @@ (define openpty (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