[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: btrfs-progs: Fix cross-compilation.
From: |
guix-commits |
Subject: |
branch master updated: gnu: btrfs-progs: Fix cross-compilation. |
Date: |
Sat, 21 May 2022 14:43:09 -0400 |
This is an automated email from the git hooks/post-receive script.
nckx pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 014f97544d gnu: btrfs-progs: Fix cross-compilation.
014f97544d is described below
commit 014f97544dbe4f08405320d129a1a5d9c1f775f0
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun May 15 02:00:06 2022 +0200
gnu: btrfs-progs: Fix cross-compilation.
* gnu/packages/linux.scm (btrfs-progs)[arguments]: Add "--disable-python"
support to #:configure-flags.
[inputs]: Move eudev here…
[native-inputs]: …from here.
Reported by Pavel Shlyak <p.shlyak@pantherx.org>.
---
gnu/packages/linux.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8c29776b64..7b564e7ef1 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5549,7 +5549,11 @@ and copy/paste text in the console and in xterm.")
(outputs '("out"
"static")) ; static versions of the binaries in "out"
(arguments
- '(#:phases (modify-phases %standard-phases
+ '(#:configure-flags
+ ;; The ‘Python support’ was never actually installed by previous
+ ;; versions of this package, but did prevent cross-compilation.
+ (list "--disable-python")
+ #:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-makefile
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile"
@@ -5576,6 +5580,7 @@ and copy/paste text in the console and in xterm.")
#:test-target "test"
#:parallel-tests? #f)) ; tests fail when run in parallel
(inputs `(("e2fsprogs" ,e2fsprogs) ; for btrfs-convert
+ ("eudev" ,eudev)
("lzo" ,lzo)
("util-linux:lib" ,util-linux "lib") ;for libblkid and
libuuid
("util-linux:static" ,util-linux "static") ;ditto
@@ -5594,7 +5599,6 @@ and copy/paste text in the console and in xterm.")
("acl" ,acl)
("which" ,which)
("dmsetup" ,lvm2)
- ("udevadm" ,eudev)
;; The tests need 'grep' with perl regexp support.
("grep" ,grep)))
(home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: btrfs-progs: Fix cross-compilation.,
guix-commits <=