me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ludovic Courtès 2023-10-13 17:26:16 +02:00
parent 8e3d710f4c
commit b4d6a43173
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gnu/packages/mail.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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, 2015, 2017, 2020 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com>
@ -4243,10 +4243,7 @@ Git and exports them in maildir format or to an MDA through a pipe.")
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system perl-build-system) (build-system perl-build-system)
(arguments (arguments
`(#:imported-modules (,@%perl-build-system-modules `(#:modules ((guix build perl-build-system)
(guix build syscalls))
#:modules ((guix build perl-build-system)
(guix build syscalls)
(guix build utils) (guix build utils)
(ice-9 match)) (ice-9 match))
#:phases #:phases
@ -4283,18 +4280,20 @@ Git and exports them in maildir format or to an MDA through a pipe.")
(setenv "TMP" "/tmp") (setenv "TMP" "/tmp")
(setenv "TMPDIR" "/tmp") (setenv "TMPDIR" "/tmp")
;; Use tini so that signals are properly handled and (apply execlp "make"
;; 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" "--"
"make" "check" test-flags)) "make" "check" test-flags))
(pid (make-pid
(match (waitpid pid) ;; Reap child processes; otherwise, lei-daemon is kept as
((_ . status) ;; 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) (unless (zero? status)
(error "`make check' exited with status" status)))))) (error "`make check' exited with status"
status))
(loop)))))))
(format #t "test suite not run~%")))) (format #t "test suite not run~%"))))
(add-after 'install 'wrap-programs (add-after 'install 'wrap-programs
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -4314,7 +4313,7 @@ Git and exports them in maildir format or to an MDA through a pipe.")
(find-files (string-append out "/bin"))))))))) (find-files (string-append out "/bin")))))))))
(native-inputs (native-inputs
(list ;; For testing. (list ;; For testing.
lsof openssl tini)) lsof openssl))
(inputs (inputs
(append (append
(if (not (target-64bit?)) (if (not (target-64bit?))