[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
18/84: gnu: parted: Support building for the Hurd.
From: |
guix-commits |
Subject: |
18/84: gnu: parted: Support building for the Hurd. |
Date: |
Wed, 14 Jun 2023 06:23:55 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit b1066d84b1176df9ae7733bd1197e09b22e12e86
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue May 23 14:29:21 2023 +0200
gnu: parted: Support building for the Hurd.
* gnu/packages/disk.scm (parted)[inputs]: Remove lvm2, add hurd-minimal
when building for the Hurd.
[arguments]: Add configure-flag '--disable-device-mapper' when building for
the Hurd.
---
gnu/packages/disk.scm | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 894a542171..0d84974ef5 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016, 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
@@ -67,6 +67,7 @@
#: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,24 @@ tmpfs/ramfs filesystems.")
"18h51i3x5cbqhlj5rm23m9sfw63gaaby5czln5w6qpqj3ifdsf29"))))
(build-system gnu-build-system)
(arguments
- (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"))))))))
+ (list
+ #:configure-flags (if (hurd-target?)
+ #~'("--disable-device-mapper")
+ #~'())
+ #: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"))))))))
(inputs
- (list lvm2 readline
- `(,util-linux "lib")))
+ `(,@(if (hurd-target?)
+ (list hurd-minimal)
+ (list lvm2))
+ ,readline
+ (,util-linux "lib")))
(native-inputs
(list gettext-minimal
- branch wip-hurd created (now 84b664bb10), guix-commits, 2023/06/14
- 20/84: hurd-boot: Setup pci-arbiter and rumpdisk translators., guix-commits, 2023/06/14
- 11/84: squash! gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/14
- 13/84: Revert "hurd-boot: Add urandom and default-pager translators.", guix-commits, 2023/06/14
- 18/84: gnu: parted: Support building for the Hurd.,
guix-commits <=
- 07/84: squash! gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/14
- 26/84: hurd-boot: Cater for netdde., guix-commits, 2023/06/14
- 31/84: gnu: commencement: Add automake-boot0., guix-commits, 2023/06/14
- 38/84: gnu: coreutils: Skip hanging and failing test for the Hurd., guix-commits, 2023/06/14
- 53/84: gnu: libgpg-error: Skip failing test for the Hurd., guix-commits, 2023/06/14
- 74/84: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/06/14
- 64/84: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/06/14
- 67/84: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/06/14
- 75/84: gnu: ghostscript: Fix build for the Hurd., guix-commits, 2023/06/14
- 69/84: gnu: cmake-bootstrap: Fix build for the Hurd., guix-commits, 2023/06/14