[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#66525] [PATCH v2 01/10] gnu: mutter: Remove dependency on (guix bui
From: |
Ludovic Courtès |
Subject: |
[bug#66525] [PATCH v2 01/10] gnu: mutter: Remove dependency on (guix build syscalls). |
Date: |
Sun, 22 Oct 2023 15:43:25 +0200 |
* gnu/packages/gnome.scm (mutter)[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/gnome.scm | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2ffe8dfef2..ac3035e07d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7831,10 +7831,7 @@ (define-public mutter
(build-system meson-build-system)
(arguments
(list
- #:imported-modules `(,@%meson-build-system-modules
- (guix build syscalls))
#:modules '((guix build meson-build-system)
- (guix build syscalls)
(guix build utils)
(ice-9 match))
#:glib-or-gtk? #t
@@ -7928,22 +7925,22 @@ (define-public mutter
"1"))
(match (primitive-fork)
(0 ;child process
- (set-child-subreaper!)
- ;; Use tini so that signals are properly handled and
- ;; doubly-forked processes get reaped; otherwise,
- ;; python-dbusmock would waste time polling for the dbus
- ;; processes it spawns to be reaped, in vain.
- (apply execlp "tini" "--"
- "dbus-run-session" "--"
+ (apply execlp "dbus-run-session" "dbus-run-session"
"xvfb-run" "-a" "-s" (getenv "XVFB_SERVER_ARGS")
"meson" "test" "-t" "0" "--print-errorlogs"
test-options))
- (pid
- (match (waitpid pid)
- ((_ . status)
- (unless (zero? status)
- (error "`meson test' exited with status"
- status))))))))))))
+ (dbus-pid
+ (let loop ()
+ ;; Reap child processes; otherwise, python-dbusmock would
+ ;; waste time polling for the dbus processes it spawns to
+ ;; be reaped, in vain.
+ (match (waitpid WAIT_ANY)
+ ((pid . status)
+ (if (= pid dbus-pid)
+ (unless (zero? status)
+ (error "`meson test' exited with status"
+ status))
+ (loop)))))))))))))
(native-inputs
(list desktop-file-utils ;for update-desktop-database
`(,glib "bin") ;for glib-compile-schemas, etc.
@@ -7964,8 +7961,7 @@ (define-public mutter
pipewire
python
python-dbus
- python-dbusmock
- tini)) ;acting as init (zombie reaper)
+ python-dbusmock))
(propagated-inputs
(list gsettings-desktop-schemas-next ;required by libmutter.pc
gtk+ ;required by libmutter.pc
--
2.41.0
- [bug#66525] [PATCH 1/7] gnu: mutter: Remove dependency on (guix build syscalls)., (continued)
[bug#66525] [PATCH 1/7] gnu: mutter: Remove dependency on (guix build syscalls)., Bruno Victal, 2023/10/13
[bug#66525] [PATCH 1/7] gnu: mutter: Remove dependency on (guix build syscalls)., Maxim Cournoyer, 2023/10/14
- [bug#66525] [PATCH 1/7] gnu: mutter: Remove dependency on (guix build syscalls)., Ludovic Courtès, 2023/10/14
- [bug#66525] [PATCH 1/7] gnu: mutter: Remove dependency on (guix build syscalls)., Maxim Cournoyer, 2023/10/15
- [bug#66525] [PATCH 1/7] gnu: mutter: Remove dependency on (guix build syscalls)., Ludovic Courtès, 2023/10/16
- [bug#66525] [PATCH 1/7] gnu: mutter: Remove dependency on (guix build syscalls)., Maxim Cournoyer, 2023/10/16
- [bug#66525] [PATCH v2 00/10] Remove dependency of polkit, python-dbusmock, etc. on (guix build syscalls), Ludovic Courtès, 2023/10/22
- [bug#66525] [PATCH v2 01/10] gnu: mutter: Remove dependency on (guix build syscalls).,
Ludovic Courtès <=
- [bug#66525] [PATCH v2 06/10] gnu: polkit: Remove dependency on (guix build syscalls)., Ludovic Courtès, 2023/10/22
- [bug#66525] [PATCH v2 07/10] gnu: public-inbox: Remove dependency on (guix build syscalls)., Ludovic Courtès, 2023/10/22
- [bug#66525] [PATCH v2 05/10] gnu: python-dbusmock: Use ‘search-input-file’., Ludovic Courtès, 2023/10/22
- [bug#66525] [PATCH v2 03/10] gnu: python-dbusmock: Remove dependency on (guix build syscalls)., Ludovic Courtès, 2023/10/22
- [bug#66525] [PATCH v2 04/10] gnu: python-dbusmock: Rewrite phases as a gexp., Ludovic Courtès, 2023/10/22
- [bug#66525] [PATCH v2 02/10] gnu: python-ipykernel: Remove dependency on (guix build syscalls)., Ludovic Courtès, 2023/10/22
- [bug#66525] [PATCH v2 09/10] build-system/android-ndk: Remove dependency on (guix build syscalls)., Ludovic Courtès, 2023/10/22
- [bug#66525] [PATCH v2 08/10] build-system/ant: Remove dependency on (guix build syscalls)., Ludovic Courtès, 2023/10/22
- [bug#66525] [PATCH v2 10/10] build-system/dub: Remove dependency on (guix build syscalls)., Ludovic Courtès, 2023/10/22
- [bug#66525] [PATCH v2 00/10] Remove dependency of polkit, python-dbusmock, etc. on (guix build syscalls), Maxim Cournoyer, 2023/10/22