[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/10: gnu: public-inbox: Remove dependency on (guix build syscalls).
From: |
guix-commits |
Subject: |
07/10: gnu: public-inbox: Remove dependency on (guix build syscalls). |
Date: |
Sun, 22 Oct 2023 09:38:21 -0400 (EDT) |
civodul pushed a commit to branch wip-syscall-update
in repository guix.
commit 5e7e25542f40bc869303339e54a98705d7dc0331
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Oct 13 17:26:16 2023 +0200
gnu: public-inbox: Remove dependency on (guix build syscalls).
* gnu/packages/mail.scm (public-inbox)[arguments]: Remove
#:imported-modules.
Remove (guix build syscalls) from #:modules. Rewrite ‘check’ phase to
reap processes from the build process.
[native-inputs]: Remove TINI.
---
gnu/packages/mail.scm | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index be458a2d92..fc5cde38ce 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic
Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2017, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com>
@@ -4242,10 +4242,7 @@ Git and exports them in maildir format or to an MDA
through a pipe.")
(file-name (git-file-name name version))))
(build-system perl-build-system)
(arguments
- `(#:imported-modules (,@%perl-build-system-modules
- (guix build syscalls))
- #:modules ((guix build perl-build-system)
- (guix build syscalls)
+ `(#:modules ((guix build perl-build-system)
(guix build utils)
(ice-9 match))
#:phases
@@ -4282,18 +4279,20 @@ Git and exports them in maildir format or to an MDA
through a pipe.")
(setenv "TMP" "/tmp")
(setenv "TMPDIR" "/tmp")
- ;; Use tini so that signals are properly handled and
- ;; doubly-forked processes get reaped; otherwise,
- ;; lei-daemon is kept as a zombie and the testsuite
- ;; fails thinking that it didn't quit as it should.
- (set-child-subreaper!)
- (apply execlp "tini" "--"
+ (apply execlp "make"
"make" "check" test-flags))
- (pid
- (match (waitpid pid)
- ((_ . status)
- (unless (zero? status)
- (error "`make check' exited with status" status))))))
+ (make-pid
+ ;; Reap child processes; otherwise, lei-daemon is kept as
+ ;; a zombie and the testsuite fails thinking that it
+ ;; didn't quit as it should.
+ (let loop ()
+ (match (waitpid WAIT_ANY)
+ ((pid . status)
+ (if (= pid make-pid)
+ (unless (zero? status)
+ (error "`make check' exited with status"
+ status))
+ (loop)))))))
(format #t "test suite not run~%"))))
(add-after 'install 'wrap-programs
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -4313,7 +4312,7 @@ Git and exports them in maildir format or to an MDA
through a pipe.")
(find-files (string-append out "/bin")))))))))
(native-inputs
(list ;; For testing.
- lsof openssl tini))
+ lsof openssl))
(inputs
(append
(if (not (target-64bit?))
- branch wip-syscall-update created (now 1f926dea6d), guix-commits, 2023/10/22
- 03/10: gnu: python-dbusmock: Remove dependency on (guix build syscalls)., guix-commits, 2023/10/22
- 04/10: gnu: python-dbusmock: Rewrite phases as a gexp., guix-commits, 2023/10/22
- 05/10: gnu: python-dbusmock: Use ‘search-input-file’., guix-commits, 2023/10/22
- 06/10: gnu: polkit: Remove dependency on (guix build syscalls)., guix-commits, 2023/10/22
- 01/10: gnu: mutter: Remove dependency on (guix build syscalls)., guix-commits, 2023/10/22
- 02/10: gnu: python-ipykernel: Remove dependency on (guix build syscalls)., guix-commits, 2023/10/22
- 10/10: build-system/dub: Remove dependency on (guix build syscalls)., guix-commits, 2023/10/22
- 07/10: gnu: public-inbox: Remove dependency on (guix build syscalls).,
guix-commits <=
- 09/10: build-system/android-ndk: Remove dependency on (guix build syscalls)., guix-commits, 2023/10/22
- 08/10: build-system/ant: Remove dependency on (guix build syscalls)., guix-commits, 2023/10/22