From patchwork Sun Oct 22 13:43:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 55120 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0A55527BBE2; Sun, 22 Oct 2023 14:45:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0C86D27BBEB for ; Sun, 22 Oct 2023 14:45:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quYkv-0004De-Jd; Sun, 22 Oct 2023 09:44:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1quYkt-0004Bl-GE for guix-patches@gnu.org; Sun, 22 Oct 2023 09:44:35 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quYkt-0003RC-8O for guix-patches@gnu.org; Sun, 22 Oct 2023 09:44:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quYlK-0000a4-Ql; Sun, 22 Oct 2023 09:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66525] [PATCH v2 01/10] gnu: mutter: Remove dependency on (guix build syscalls). Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sun, 22 Oct 2023 13:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66525 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66525@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 66525-submit@debbugs.gnu.org id=B66525.16979822702064 (code B ref 66525); Sun, 22 Oct 2023 13:45:02 +0000 Received: (at 66525) by debbugs.gnu.org; 22 Oct 2023 13:44:30 +0000 Received: from localhost ([127.0.0.1]:45681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkn-0000X9-FJ for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYkl-0000Wl-L1 for 66525@debbugs.gnu.org; Sun, 22 Oct 2023 09:44:28 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1quYkD-0003I6-UX; Sun, 22 Oct 2023 09:43:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=Xv7o402aR61dbohBxM6uRabw+HjchZgutVA3W2QebzI=; b=oGluH4Cu8X302v7k5IzT pQvmEue8KVNa2RSCpDps2fdVMy48fDfOC1JcPOh4GrtfN5NK5jrs011cKWBOVBXP5vzYnR+Oo/srd c0Y4JQaB7t6fEh3Xg8wcowR5/FZB3TxtuAuFOJipjxuq3aosoSQQsZhNvGmk7nUeYqimo2zxjIlJj iDiJb0YWla6ffZ6+ySGjF1FACrGCYcAsXravXr7GOjmArR3ha909ZCUiSW5ueupngM9a7gmsl/CDf ahDWe0s7KkfXYgeWgDYAuzEYLC05MM3se1ZVfxwMI1FO5133tGk0kCPXRwczuLI9/N2ga1X8kCH0v hsz1yMwxGLQKUA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 22 Oct 2023 15:43:25 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <87o7gywndy.fsf@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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