From patchwork Wed Mar 27 14:52:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 62283 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 C04F327BBEA; Wed, 27 Mar 2024 14:54:31 +0000 (GMT) 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 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 408F427BBE2 for ; Wed, 27 Mar 2024 14:54:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpUfK-000128-US; Wed, 27 Mar 2024 10:54:11 -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 1rpUfH-0000zI-Uy for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:07 -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 1rpUfH-0008O0-MM for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpUfH-0000rs-R5 for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70031] [core-updates PATCH 14/19] gnu: astroid: Remove custom phases. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 14:54:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70031 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70031@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 70031-submit@debbugs.gnu.org id=B70031.17115512403198 (code B ref 70031); Wed, 27 Mar 2024 14:54:07 +0000 Received: (at 70031) by debbugs.gnu.org; 27 Mar 2024 14:54:00 +0000 Received: from localhost ([127.0.0.1]:38136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUfA-0000pQ-Bs for submit@debbugs.gnu.org; Wed, 27 Mar 2024 10:54:00 -0400 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]:51480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUeg-0000mc-9l for 70031@debbugs.gnu.org; Wed, 27 Mar 2024 10:53:30 -0400 Received: by mail-qt1-x835.google.com with SMTP id d75a77b69052e-42f52226f9bso26182741cf.3 for <70031@debbugs.gnu.org>; Wed, 27 Mar 2024 07:53:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1711551204; x=1712156004; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PKT4Mi3sbDQcmzwlWYrcpNfjMgrGHqlTlzba6xSnqtI=; b=WnCmkHOFADLc6LrrYVjnH8hldJ6d+u/qEw4QjZh+hPlGA7MYdtNWDlb6Qjgfb3TD6j k4xz4Q0oJ1/MQrf7AcpDPyq9qT5A0YL94u8JUt5Xa+RGkIGsmEDU63NyLEnVElabDngb +ZwTC/fVMHFko2VkpK9aUzyJOg95z4L6i2umakGdj/BqIEUcE7d2EaNuofODZ7I0LKQm reaTxFyCYNSXZMlGgmY7KIoJ3ncqB+5/9Lj4OdCMvCHEMg79kKs2vHx9ihULNz/UBgnd 2V2oXcYLCIW8N+3IITbVerFzsqfFRmJoZG60fg/Dgkibn+W97EWOSIOy/H6kPEj7mMCt 3QOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711551204; x=1712156004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PKT4Mi3sbDQcmzwlWYrcpNfjMgrGHqlTlzba6xSnqtI=; b=QiG+k02o0EbznTBKJGyWa/JVQYvJMeLQbyJZX+2JFrNZQzLKg8QEXsUibvMD0M3jFB aazpOUQb0NrOjA27yrucV4MtvVgFDOME01KtiWrcl8bO+rmtqKuQDwRJ5G6l/DN++9sQ ofb2XPoeiGF9quGlmWiXhHanOaqZgr1yd9kKPiBYUjiW1nVDkNCQ07OLR87uh/QebbkG 4JAInIn5nwB2Z3IEvVvO6sPt0XpkheOufa7zXzVdQ5TC6wd+ol8WVEH+9iD4U6jWxEVp hSJpw60VSSw2bQ45531zrHG6W+sYM3IuLvPOX3DlrYTGWEqz7J9B2I8artuKUjDi5xEQ rSBw== X-Gm-Message-State: AOJu0Ywb2t1VDtyXvDWLPs1TJpmBbkGGDiydNjOiIdjkcdov90D0A/Ig Kfn/Z74gQgtSGCmImfJYPv+weyUhPOVJfLRpMSSV0xCx1EdncBkRW7VECXVvnjq+KqNaIyicRnA K X-Google-Smtp-Source: AGHT+IF0wZ68yZtgtKJcPm+DlmrLTaUd+VPc5Rjo6BLOobpuWGOCdZgT20C8OD8+8OLw9Aeu/WELQw== X-Received: by 2002:a05:622a:15c3:b0:431:4e88:b8ef with SMTP id d3-20020a05622a15c300b004314e88b8efmr3362117qty.26.1711551204477; Wed, 27 Mar 2024 07:53:24 -0700 (PDT) Received: from ip-10-114-89-186.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id fk23-20020a05622a559700b00430c8b87b46sm4882915qtb.6.2024.03.27.07.53.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 07:53:24 -0700 (PDT) From: Greg Hogan Date: Wed, 27 Mar 2024 14:52:39 +0000 Message-ID: <567ffcd595b40938fefee7d90de6dea3fcafee23.1711549375.git.code@greghogan.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: 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/mail.scm (astroid)[arguments]: Disable parallel tests. Add generator. Remove custom 'build, 'check, and 'install phases. --- gnu/packages/mail.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 23c78a6db5b..e99736752f0 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -903,13 +903,14 @@ (define-public astroid (("\\\\n\\.\\.\\.") "\\n...\\n")))))) (build-system cmake-build-system) (arguments - `(#:modules ((guix build cmake-build-system) + `(#:parallel-tests? #f + #:modules ((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils) (ice-9 match)) #:imported-modules ((guix build glib-or-gtk-build-system) ,@%cmake-build-system-modules) - #:configure-flags (list "-GNinja") + #:generator "Ninja" #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-markdown-test @@ -920,23 +921,12 @@ (define-public astroid (lambda _ (substitute* "tests/CMakeLists.txt" ((".*markdown.*") "")))) - (replace 'build - (lambda _ - (invoke "ninja" "-j" (number->string (parallel-job-count))))) (add-before 'check 'start-xserver (lambda* (#:key inputs #:allow-other-keys) (let ((xorg-server (assoc-ref inputs "xorg-server"))) (setenv "HOME" (getcwd)) (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) (setenv "DISPLAY" ":1")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (invoke "ctest" ".")))) - (replace 'install - (lambda _ - (invoke "ninja" "install"))) (add-after 'install 'wrap-with-GI_TYPELIB_PATH (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))