guix-commits
[Top][All Lists]
Advanced

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

branch master updated: gnu: bcachefs-tools-static: Fix build.


From: guix-commits
Subject: branch master updated: gnu: bcachefs-tools-static: Fix build.
Date: Sat, 23 Oct 2021 10:52:52 -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 5df0300  gnu: bcachefs-tools-static: Fix build.
5df0300 is described below

commit 5df03003e62748734781ed8425b2aeceba256652
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sat Oct 23 16:48:39 2021 +0200

    gnu: bcachefs-tools-static: Fix build.
    
    This follows up on commit 196e3f52355ee7d086e67eb769d714dd040d61c2:
    bcachefs-tools now unconditionally builds and installs libbcachefs.so.
    
    * gnu/packages/file-systems.scm (bcachefs-tools-static)[arguments]:
    Add a new 'skip-shared-library phase.
---
 gnu/packages/file-systems.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 32a6a33..6848830 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -507,7 +507,17 @@ performance and other characteristics.")
       (substitute-keyword-arguments (package-arguments bcachefs-tools)
         ((#:make-flags make-flags)
          `(append ,make-flags
-                  (list "LDFLAGS=-static")))))
+                  (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.*") ""))))))))
      (inputs
       `(("eudev:static" ,eudev "static")
         ("libscrypt:static" ,libscrypt "static")



reply via email to

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