[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
18/89: gnu: parted: Support building for the Hurd.
From: |
guix-commits |
Subject: |
18/89: gnu: parted: Support building for the Hurd. |
Date: |
Tue, 20 Jun 2023 05:58:53 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit e0184c46f2c9b1f5a04ff46059901ccd342b6cd8
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 abbc87a95a..466070248d 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>
@@ -69,6 +69,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)
@@ -251,17 +252,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 (target-hurd?)
+ #~'("--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 (target-hurd?)
+ (list hurd-minimal)
+ (list lvm2))
+ ,readline
+ (,util-linux "lib")))
(native-inputs
(list gettext-minimal
- 82/89: system: hurd: Add swap-services to hurd-default-essential-services., (continued)
- 82/89: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/06/20
- 83/89: build: Build gnu/packages/*.go in four steps., guix-commits, 2023/06/20
- 86/89: gnu: guix: Update to 1.4.0-8.656960a93a., guix-commits, 2023/06/20
- 88/89: DRAFT hurd-boot: Support second boot., guix-commits, 2023/06/20
- 03/89: gnu: gnumach-headers: Cross-build without relying on x86., guix-commits, 2023/06/20
- 08/89: gnu: gnumach: Update to 1.8+git20221224., guix-commits, 2023/06/20
- 09/89: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/06/20
- 04/89: gnu: hurd: Update supported systems., guix-commits, 2023/06/20
- 11/89: squash! gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/20
- 12/89: gnu: hurd: Update to v0.9.git20230216., guix-commits, 2023/06/20
- 18/89: gnu: parted: Support building for the Hurd.,
guix-commits <=
- 19/89: gnu: hurd: Add rumpkernel., guix-commits, 2023/06/20
- 21/89: services: childhurd: Bump default qemu memory to 2048MB., guix-commits, 2023/06/20
- 23/89: bootloader: grub: Use rumpdisk-style root when booting with "noide"., guix-commits, 2023/06/20
- 15/89: gnu: hurd: Update libpciaccess to 0.17., guix-commits, 2023/06/20
- 17/89: gnu: hurd-minimal: Include libshouldbeinlibc and libstore., guix-commits, 2023/06/20
- 24/89: gnu: gnumach: Support "noide" argument., guix-commits, 2023/06/20
- 25/89: gnu: netdde: Resurrect and update to 2.6.32.65-2-e67c284ac1., guix-commits, 2023/06/20
- 26/89: hurd-boot: Cater for netdde., guix-commits, 2023/06/20
- 27/89: system: hurd: Add netdde to %base-packages/hurd., guix-commits, 2023/06/20
- 29/89: gnu: gnumach: Disable builtin networking., guix-commits, 2023/06/20