GNU bug report logs - #63527
[PATCH 0/3] Initial attempt at rumpdisk support for the Hurd.

Previous Next

Full log

View this message in rfc822 format

From: Janneke Nieuwenhuizen <janneke <at> gnu.org>
To: 63527 <at> debbugs.gnu.org
Subject: [bug#63527] [PATCH v5 05/11] gnu: parted: Support building for the Hurd.
Date: Tue, 23 May 2023 17:47:26 +0200

* 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 <mhw <at> netris.org>
 ;;; Copyright © 2016, 2018–2022 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim <at> flashner.co.il>
-;;; Copyright © 2016 Jan Nieuwenhuizen <janneke <at> gnu.org>
+;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen <janneke <at> gnu.org>
 ;;; Copyright © 2016 Roel Janssen <roel <at> gnu.org>
 ;;; Copyright © 2016, 2017 Marius Bakke <mbakke <at> fastmail.com>
 ;;; Copyright © 2017 Hartmut Goebel <h.goebel <at> crazy-compilers.com>
@@ -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
 
-- 
2.40.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.