From patchwork Tue May 23 15:47:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 50253 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 C297027BBEA; Tue, 23 May 2023 16:48:26 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 1527327BBE2 for ; Tue, 23 May 2023 16:48:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1UF8-00079i-7C; Tue, 23 May 2023 11:48:10 -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 1q1UF4-00071I-1J for guix-patches@gnu.org; Tue, 23 May 2023 11:48:06 -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 1q1UF3-0006EX-HY for guix-patches@gnu.org; Tue, 23 May 2023 11:48:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1UF3-0007sq-A2 for guix-patches@gnu.org; Tue, 23 May 2023 11:48:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v5 05/11] gnu: parted: Support building for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 May 2023 15:48:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63527 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168485687530195 (code B ref 63527); Tue, 23 May 2023 15:48:05 +0000 Received: (at 63527) by debbugs.gnu.org; 23 May 2023 15:47:55 +0000 Received: from localhost ([127.0.0.1]:40228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEs-0007qo-9x for submit@debbugs.gnu.org; Tue, 23 May 2023 11:47:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1UEi-0007oA-I9 for 63527@debbugs.gnu.org; Tue, 23 May 2023 11:47:45 -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 1q1UEd-00063x-AX; Tue, 23 May 2023 11:47:39 -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=qR4kXs0jETPp81H2aGrDPPvydsfBoDfYYQu35k44grE=; b=iidw9ijMOwY7xuxmv4jP OR5mEPjm9LMT/esVaYLQVfYOdtIKSvaKspse4TBB2hnbwXnx/J4A3UkcGwNOytpXWrwAOLRtg8jIu ExhkyqLG5ADzzpaFFIEBrddaQ5frcf5ewk2Tn6TkrzOpfO0W/oIN93nYNPYsrxryv2oDGQJRblzKa X9n/DNL+VFuzPNo2LbO4YyBwMI67IrWQRfESIKcD6OHwkiFYF54HE9WW1RAu1ilWDySO1qi7UDbz8 KLNuiIpqJ6AnctLqjpq76mf0ZGf8N9iwcCYXMN51dDANkw14iix9Aiq59ov7rkD7KhQqgJdRMVl+x g56LXvWWh2gT3g==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1q1UEc-0002jp-PE; Tue, 23 May 2023 11:47:39 -0400 From: Janneke Nieuwenhuizen Date: Tue, 23 May 2023 17:47:26 +0200 Message-Id: <71a14f2a5b28b90b2a996b1afab6e39c101dfa1d.1684855847.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 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/disk.scm (parted)[inputs]: Remove lvm2, add hurd-shouldbeinlibc when building for the Hurd. [arguments]: Add configure-flag '--disable-device-mapper' when building for the Hurd. --- gnu/packages/disk.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 894a542171..760e9cd8f6 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2016 Jan Nieuwenhuizen +;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2017 Hartmut Goebel @@ -67,6 +67,7 @@ (define-module (gnu packages disk) #:use-module (gnu packages graphics) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages hurd) #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) @@ -249,17 +250,25 @@ (define-public parted "18h51i3x5cbqhlj5rm23m9sfw63gaaby5czln5w6qpqj3ifdsf29")))) (build-system gnu-build-system) (arguments - (list #:phases + (append + (if (hurd-target?) + '(#:configure-flags '("--disable-device-mapper")) + '()) + (list + #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-locales-and-python (lambda _ (substitute* "tests/t0251-gpt-unicode.sh" (("C.UTF-8") "en_US.utf8")) ;not in Glibc locales (substitute* "tests/msdos-overlap" - (("/usr/bin/python") (which "python")))))))) + (("/usr/bin/python") (which "python"))))))))) (inputs - (list lvm2 readline - `(,util-linux "lib"))) + `(,@(if (hurd-target?) + (list hurd-shouldbeinlibc) + (list lvm2)) + ,readline + (,util-linux "lib"))) (native-inputs (list gettext-minimal