[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
18/85: gnu: parted: Support building for the Hurd.
From: |
guix-commits |
Subject: |
18/85: gnu: parted: Support building for the Hurd. |
Date: |
Thu, 15 Jun 2023 02:32:37 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 1d337e3ca0816e0fc0f0351410d22d053d75a966
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
- 56/85: gnu: curl: Skip failing test for the Hurd., (continued)
- 56/85: gnu: curl: Skip failing test for the Hurd., guix-commits, 2023/06/15
- 70/85: gnu: cmake-minimal: Skip tests for the Hurd., guix-commits, 2023/06/15
- 72/85: gnu: graphite2: Skip test for the Hurd., guix-commits, 2023/06/15
- 77/85: gnu: pango: Support build for the Hurd., guix-commits, 2023/06/15
- 85/85: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/06/15
- 12/85: gnu: hurd: Update to v0.9.git20230216., guix-commits, 2023/06/15
- 17/85: gnu: hurd-minimal: Include libshouldbeinlibc and libstore., guix-commits, 2023/06/15
- 15/85: gnu: hurd: Update libpciaccess to 0.17., guix-commits, 2023/06/15
- 14/85: gnu: Add libpciaccess-0.17., guix-commits, 2023/06/15
- 76/85: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/06/15
- 18/85: gnu: parted: Support building for the Hurd.,
guix-commits <=
- 21/85: services: childhurd: Bump default qemu memory to 2048MB., guix-commits, 2023/06/15
- 36/85: Revert "gnu: libunistring: Fix make check for the Hurd.", guix-commits, 2023/06/15
- 32/85: gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20221224., guix-commits, 2023/06/15
- 48/85: gnu: python: Support native build on the Hurd., guix-commits, 2023/06/15
- 81/85: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/06/15
- 45/85: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/06/15
- 03/85: gnu: gnumach-headers: Cross-build without relying on x86., guix-commits, 2023/06/15
- 04/85: gnu: hurd: Update supported systems., guix-commits, 2023/06/15
- 05/85: gnu: Add libc-for-target and glibc/hurd., guix-commits, 2023/06/15
- 20/85: hurd-boot: Setup pci-arbiter and rumpdisk translators., guix-commits, 2023/06/15