From patchwork Wed May 10 16:39:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 49913 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 A550F27BBEE; Wed, 10 May 2023 17:40:55 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 DBD1927BBEC for ; Wed, 10 May 2023 17:40:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwmrG-0006Yt-OS; Wed, 10 May 2023 12:40:06 -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 1pwmrD-0006YG-IV for guix-patches@gnu.org; Wed, 10 May 2023 12:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwmrD-00060K-8y for guix-patches@gnu.org; Wed, 10 May 2023 12:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwmrD-0003PJ-5E for guix-patches@gnu.org; Wed, 10 May 2023 12:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63420] [PATCH v1 3/4] gnu: btrfs-progs: Make the python-sphinx input conditional. Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2023 16:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari , Tobias Geerinckx-Rice , 63420@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli Received: via spool by 63420-submit@debbugs.gnu.org id=B63420.168373677413028 (code B ref 63420); Wed, 10 May 2023 16:40:03 +0000 Received: (at 63420) by debbugs.gnu.org; 10 May 2023 16:39:34 +0000 Received: from localhost ([127.0.0.1]:48854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwmqj-0003Ny-CE for submit@debbugs.gnu.org; Wed, 10 May 2023 12:39:33 -0400 Received: from cyberdimension.org ([80.67.179.20]:49868 helo=gnutoo.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwmqg-0003NM-TK for 63420@debbugs.gnu.org; Wed, 10 May 2023 12:39:31 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id 394f0de7; Wed, 10 May 2023 16:39:28 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 91199b15; Wed, 10 May 2023 16:39:27 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Wed, 10 May 2023 18:39:24 +0200 Message-Id: <20230510163925.3071-3-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230510163925.3071-1-GNUtoo@cyberdimension.org> References: <20230510163925.3071-1-GNUtoo@cyberdimension.org> 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/linux.scm (btrfs-progs) [native-inputs]: Make the python-sphinx input conditional. [arguments]: Conditionally add --disable-documentation to configure flags. Signed-off-by: Denis 'GNUtoo' Carikli --- gnu/packages/linux.scm | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a71100baab..e910c47ab9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5894,9 +5894,18 @@ (define-public btrfs-progs (arguments (list #:configure-flags - ;; The ‘Python support’ was never actually installed by previous - ;; versions of this package, but did prevent cross-compilation. - #~(list "--disable-python") + #~(append + ;; Without --disable-documentation, it complains about missing + ;; python-sphinx on systems where this package isn't available + ;; (because it requires Rust). + (if #$@(member (%current-system) + (package-transitive-supported-systems + python-sphinx)) + '() + (list "--disable-documentation")) + ;; The ‘Python support’ was never actually installed by previous + ;; versions of this package, but did prevent cross-compilation. + (list "--disable-python")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-makefile (lambda* (#:key outputs #:allow-other-keys) @@ -5935,15 +5944,24 @@ (define-public btrfs-progs `(,zlib "static") `(,zstd "lib") `(,zstd "static"))) - (native-inputs (list pkg-config - python-sphinx ;; For building documentation. - acl ;; For tests. - lvm2 ;; For dmsetup. - grep ;; Need Perl regexp support. - libaio - liburing - util-linux ;; For fallocate. - which)) + (native-inputs + (append + ;; For building documentation. Since python-sphinx + ;; requires Rust, add it conditionally depending on such + ;; support. + (if (member (%current-system) + (package-transitive-supported-systems + python-sphinx)) + (list python-sphinx) + '()) + (list pkg-config + acl ;; For tests. + lvm2 ;; For dmsetup. + grep ;; Need Perl regexp support. + libaio + liburing + util-linux ;; For fallocate. + which))) (home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page") (synopsis "Create and manage btrfs copy-on-write file systems") (description