mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-26 14:28:15 -05:00
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>.
This commit is contained in:
parent
fac0e3cb80
commit
014f97544d
1 changed files with 6 additions and 2 deletions
|
@ -5549,7 +5549,11 @@ (define-public btrfs-progs
|
|||
(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 @@ (define-public btrfs-progs
|
|||
#: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 @@ (define-public btrfs-progs
|
|||
("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")
|
||||
|
|
Loading…
Reference in a new issue