[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/47: gnu: parted: Support building for the Hurd.
From: |
guix-commits |
Subject: |
15/47: gnu: parted: Support building for the Hurd. |
Date: |
Sat, 3 Jun 2023 07:23:37 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit a12d7180a5a102551c176e9b6b7ccf6e01f69576
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
- 11/47: gnu: Add libpciaccess-0.17., (continued)
- 11/47: gnu: Add libpciaccess-0.17., guix-commits, 2023/06/03
- 16/47: gnu: hurd: Add rumpkernel., guix-commits, 2023/06/03
- 21/47: gnu: gnumach: Support "noide" argument., guix-commits, 2023/06/03
- 05/47: gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/03
- 10/47: squash! gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/03
- 13/47: gnu: Add rumpkernel., guix-commits, 2023/06/03
- 25/47: services: static-networking: Support netdde for the Hurd., guix-commits, 2023/06/03
- 23/47: hurd-boot: Cater for netdde., guix-commits, 2023/06/03
- 30/47: gnu: commencement: mig-boot0: Update to 1.8+git20230520., guix-commits, 2023/06/03
- 02/47: gnu: glibc/hurd-headers: Properly cross-build., guix-commits, 2023/06/03
- 15/47: gnu: parted: Support building for the Hurd.,
guix-commits <=
- 17/47: hurd-boot: Setup pci-arbiter and rumpdisk translators., guix-commits, 2023/06/03
- 27/47: gnu: commencement: Add autoconf-boot0., guix-commits, 2023/06/03
- 26/47: gnu: gnumach: Disable builtin networking., guix-commits, 2023/06/03
- 28/47: gnu: commencement: Add automake-boot0., guix-commits, 2023/06/03
- 34/47: gnu: commencement: glibc-final: Use libc-for-target for source too., guix-commits, 2023/06/03
- 33/47: gnu: commencement: glibc-final-with-bootstrap-bash: Use libc-for-target., guix-commits, 2023/06/03
- 42/47: gnu: gettext-minimal: Remove XFAIL_TESTS for the Hurd., guix-commits, 2023/06/03
- 01/47: hurd-boot: Add urandom and default-pager translators., guix-commits, 2023/06/03
- 04/47: gnu: hurd: Update supported systems., guix-commits, 2023/06/03
- 07/47: gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/03