guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/31: gnu: bcachefs-tools: Remove obsolete phase & inputs.


From: guix-commits
Subject: 02/31: gnu: bcachefs-tools: Remove obsolete phase & inputs.
Date: Sat, 29 Jul 2023 20:04:57 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit affea88cf5e44b969cf599d310323e5855dadc13
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Jul 23 02:00:00 2023 +0200

    gnu: bcachefs-tools: Remove obsolete phase & inputs.
    
    * gnu/packages/file-systems.scm (bcachefs-tools)[inputs]:
    Remove coreutils-minimal, gawk, and util-linux, needed for an old
    version of the mount.bcachefs wrapper that is no longer present.
    [arguments]: Remove custom #:phases.  The build system no longer
    explicitly builds & installs a shared library.
---
 gnu/packages/file-systems.scm | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index fe4f483ddc..c3cb96e151 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -649,11 +649,7 @@ from a mounted file system.")
              `(,util-linux "lib")
              lz4
              zlib
-             `(,zstd "lib")
-             ;; Only for mount.bcachefs.sh.
-             coreutils-minimal
-             gawk
-             util-linux))
+             `(,zstd "lib")))
       (home-page "https://bcachefs.org/";)
       (synopsis "Tools to create and manage bcachefs file systems")
       (description
@@ -677,17 +673,7 @@ performance and other characteristics.")
      (substitute-keyword-arguments (package-arguments bcachefs-tools)
        ((#:make-flags make-flags)
         #~(append #$make-flags
-              (list "LDFLAGS=-static")))
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (add-after 'unpack 'skip-shared-library
-              (lambda _
-                (substitute* "Makefile"
-                  ;; Building the shared library with ‘-static’ obviously 
fails…
-                  (("^((all|install):.*)\\blib\\b(.*)" _ prefix suffix)
-                   (string-append prefix suffix "\n"))
-                  ;; …as does installing a now non-existent file.
-                  ((".*\\$\\(INSTALL\\).* lib.*") ""))))))))
+                  (list "LDFLAGS=-static")))))
     (inputs (modify-inputs (package-inputs bcachefs-tools)
               (prepend `(,eudev "static")
                        `(,keyutils "static")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]