From: "Ludovic Courtès" <ludo@gnu.org>
To: 66525@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#66525] [PATCH v2 07/10] gnu: public-inbox: Remove dependency on (guix build syscalls).
Date: Sun, 22 Oct 2023 15:43:31 +0200 [thread overview]
Message-ID: <5e7e25542f40bc869303339e54a98705d7dc0331.1697982040.git.ludo@gnu.org> (raw)
In-Reply-To: <cover.1697982039.git.ludo@gnu.org>
* 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 @@ (define-public public-inbox
(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 @@ (define-public public-inbox
(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 @@ (define-public public-inbox
(find-files (string-append out "/bin")))))))))
(native-inputs
(list ;; For testing.
- lsof openssl tini))
+ lsof openssl))
(inputs
(append
(if (not (target-64bit?))
--
2.41.0
next prev parent reply other threads:[~2023-10-22 13:45 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-13 15:45 [bug#66525] [PATCH 0/7] Remove dependency of polkit, python-dbusmock, etc. on (guix build syscalls) Ludovic Courtès
2023-10-13 15:47 ` [bug#66525] [PATCH 1/7] gnu: mutter: Remove dependency " Ludovic Courtès
2023-10-13 16:49 ` Liliana Marie Prikler
2023-10-14 12:53 ` Maxim Cournoyer
2023-10-14 17:48 ` Ludovic Courtès
2023-10-13 17:05 ` Bruno Victal
2023-10-14 17:48 ` Ludovic Courtès
2023-10-14 12:52 ` Maxim Cournoyer
2023-10-14 17:50 ` Ludovic Courtès
2023-10-15 19:54 ` Maxim Cournoyer
2023-10-16 15:16 ` Ludovic Courtès
2023-10-16 16:19 ` Maxim Cournoyer
2023-10-22 13:43 ` [bug#66525] [PATCH v2 00/10] Remove dependency of polkit, python-dbusmock, etc. " Ludovic Courtès
2023-10-22 13:43 ` [bug#66525] [PATCH v2 01/10] gnu: mutter: Remove dependency " Ludovic Courtès
2023-10-22 13:43 ` [bug#66525] [PATCH v2 02/10] gnu: python-ipykernel: " Ludovic Courtès
2023-10-22 13:43 ` [bug#66525] [PATCH v2 03/10] gnu: python-dbusmock: " Ludovic Courtès
2023-10-22 13:43 ` [bug#66525] [PATCH v2 04/10] gnu: python-dbusmock: Rewrite phases as a gexp Ludovic Courtès
2023-10-22 13:43 ` [bug#66525] [PATCH v2 05/10] gnu: python-dbusmock: Use ‘search-input-file’ Ludovic Courtès
2023-10-22 13:43 ` [bug#66525] [PATCH v2 06/10] gnu: polkit: Remove dependency on (guix build syscalls) Ludovic Courtès
2023-10-22 13:43 ` Ludovic Courtès [this message]
2023-10-22 13:43 ` [bug#66525] [PATCH v2 08/10] build-system/ant: " Ludovic Courtès
2023-10-22 13:43 ` [bug#66525] [PATCH v2 09/10] build-system/android-ndk: " Ludovic Courtès
2023-10-22 13:43 ` [bug#66525] [PATCH v2 10/10] build-system/dub: " Ludovic Courtès
2023-10-23 1:54 ` [bug#66525] [PATCH v2 00/10] Remove dependency of polkit, python-dbusmock, etc. " Maxim Cournoyer
2023-10-23 10:09 ` Ludovic Courtès
2023-10-23 15:12 ` Maxim Cournoyer
2023-10-13 15:47 ` [bug#66525] [PATCH 2/7] gnu: python-ipykernel: Remove dependency " Ludovic Courtès
2023-10-13 15:47 ` [bug#66525] [PATCH 3/7] gnu: python-dbusmock: " Ludovic Courtès
2023-10-13 15:47 ` [bug#66525] [PATCH 4/7] gnu: python-dbusmock: Rewrite phases as a gexp Ludovic Courtès
2023-10-13 15:47 ` [bug#66525] [PATCH 5/7] gnu: python-dbusmock: Use ‘search-input-file’ Ludovic Courtès
2023-10-13 15:47 ` [bug#66525] [PATCH 6/7] gnu: polkit: Remove dependency on (guix build syscalls) Ludovic Courtès
2023-10-13 15:47 ` [bug#66525] [PATCH 7/7] gnu: public-inbox: " Ludovic Courtès
2023-10-14 12:56 ` [bug#66525] [PATCH 0/7] Remove dependency of polkit, python-dbusmock, etc. " Maxim Cournoyer
2023-10-17 8:56 ` Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5e7e25542f40bc869303339e54a98705d7dc0331.1697982040.git.ludo@gnu.org \
--to=ludo@gnu.org \
--cc=66525@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).