[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: gnu: mergerfs: Clean up arguments.
From: |
guix-commits |
Subject: |
04/05: gnu: mergerfs: Clean up arguments. |
Date: |
Thu, 8 Jul 2021 23:16:51 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 7292585f3c51112a4877f86007f43e24b12d412b
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Jul 9 02:56:08 2021 +0200
gnu: mergerfs: Clean up arguments.
* gnu/packages/file-systems.scm (mergerfs)[arguments]: Remove some
incorrect comments & rewrite code accordingly. Pass the PREFIX as a
make flag.
---
gnu/packages/file-systems.scm | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 2332258..9b8f60c 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -1391,32 +1391,28 @@ On Guix System, you will need to invoke the included
shell scripts as
(arguments
`(#:make-flags
(list (string-append "CC=" ,(cc-for-target))
- (string-append "CXX=" ,(cxx-for-target)))
- #:tests? #f ; No tests exist.
+ (string-append "CXX=" ,(cxx-for-target))
+ (string-append "PREFIX=" (assoc-ref %outputs "out")))
+ #:tests? #f ; all require a kernel with FUSE loaded
#:phases
(modify-phases %standard-phases
- (delete 'configure)
- (add-after 'unpack 'fix-paths
+ (delete 'configure) ; no configure script
+ (add-after 'unpack 'set-file-names
(lambda* (#:key inputs outputs #:allow-other-keys)
- (setenv "CC" "gcc")
- ;; These were copied from the package libfuse.
- (substitute* '("libfuse/lib/mount_util.c"
"libfuse/util/mount_util.c")
+ (substitute* "libfuse/Makefile"
+ (("/sbin") "$(EXEC_PREFIX)/sbin")
+ (("chown") "true") ; disallowed in the build environment
+ (("strip") "true")) ; breaks cross-compilation
+ ;; These were copied from the fuse package.
+ (substitute* '("libfuse/lib/mount_util.c"
+ "libfuse/util/mount_util.c")
(("/bin/(u?)mount" _ maybe-u)
(string-append (assoc-ref inputs "util-linux")
"/bin/" maybe-u "mount")))
(substitute* '("libfuse/util/mount.mergerfs.c")
(("/bin/sh" command)
- (string-append (assoc-ref inputs "bash-minimal") command)))
- ;; The Makefile does not allow overriding PREFIX via make
variables.
- (substitute* '("Makefile" "libfuse/Makefile")
- (("= /usr/local") (string-append "= " (assoc-ref outputs
"out")))
- (("= /sbin") "= $(EXEC_PREFIX)/sbin")
- ;; cannot chown as build user
- (("chown root(:root)?") "true")
- ;; Breaks cross-compilation.
- (("strip") "true"))
- #t)))))
- ;; mergerfs bundles a heavily modified copy of libfuse.
+ (string-append (assoc-ref inputs "bash-minimal")
command))))))))
+ ;; Mergerfs bundles a heavily modified copy of fuse.
(inputs
`(("bash-minimal" ,bash-minimal)
("util-linux" ,util-linux)))