me
/
guix
Archived
1
0
Fork 0
Code

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>.
master
Tobias Geerinckx-Rice 2022-05-15 02:00:06 +02:00
parent fac0e3cb80
commit 014f97544d
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/linux.scm
View File

@ -5549,7 +5549,11 @@ and copy/paste text in the console and in xterm.")
(outputs '("out" (outputs '("out"
"static")) ; static versions of the binaries in "out" "static")) ; static versions of the binaries in "out"
(arguments (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 (add-after 'unpack 'patch-makefile
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile" (substitute* "Makefile"
@ -5576,6 +5580,7 @@ and copy/paste text in the console and in xterm.")
#:test-target "test" #:test-target "test"
#:parallel-tests? #f)) ; tests fail when run in parallel #:parallel-tests? #f)) ; tests fail when run in parallel
(inputs `(("e2fsprogs" ,e2fsprogs) ; for btrfs-convert (inputs `(("e2fsprogs" ,e2fsprogs) ; for btrfs-convert
("eudev" ,eudev)
("lzo" ,lzo) ("lzo" ,lzo)
("util-linux:lib" ,util-linux "lib") ;for libblkid and libuuid ("util-linux:lib" ,util-linux "lib") ;for libblkid and libuuid
("util-linux:static" ,util-linux "static") ;ditto ("util-linux:static" ,util-linux "static") ;ditto
@ -5594,7 +5599,6 @@ and copy/paste text in the console and in xterm.")
("acl" ,acl) ("acl" ,acl)
("which" ,which) ("which" ,which)
("dmsetup" ,lvm2) ("dmsetup" ,lvm2)
("udevadm" ,eudev)
;; The tests need 'grep' with perl regexp support. ;; The tests need 'grep' with perl regexp support.
("grep" ,grep))) ("grep" ,grep)))
(home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page") (home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page")