guix-commits
[Top][All Lists]
Advanced

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

02/03: gnu: f2fs-tools-static: Work around bug in our util-linux.


From: guix-commits
Subject: 02/03: gnu: f2fs-tools-static: Work around bug in our util-linux.
Date: Sun, 3 May 2020 17:05:49 -0400 (EDT)

dannym pushed a commit to branch master
in repository guix.

commit da09c63e78ebebeabb347f483d7284b87ff51c2f
Author: Danny Milosavljevic <address@hidden>
AuthorDate: Sun May 3 22:40:57 2020 +0200

    gnu: f2fs-tools-static: Work around bug in our util-linux.
    
    * gnu/packages/linux.scm (f2fs-tools/static): Work around bug in our 
util-linux.
---
 gnu/packages/linux.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f7c42ff..3de29a5 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4628,7 +4628,14 @@ disks and SD cards.  This package provides the userland 
utilities.")
              (append-to-file "mkfs/Makefile.am" "\nmkfs_f2fs_LDFLAGS = 
-all-static\n")
              (append-to-file "fsck/Makefile.am" "\nfsck_f2fs_LDFLAGS = 
-all-static\n")
              (append-to-file "tools/Makefile.am" "\nf2fscrypt_LDFLAGS = 
-all-static -luuid\n")
-             #t)))))
+             #t))
+          (add-after 'install 'remove-store-references
+            (lambda* (#:key outputs #:allow-other-keys)
+              ;; Work around bug in our util-linux.
+              ;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=41019>.
+              (remove-store-references (string-append (assoc-ref outputs "out")
+                                                      "/sbin/mkfs.f2fs"))
+              #t)))))
      (inputs
       `(("libuuid:static" ,util-linux "static")
         ("libuuid" ,util-linux)))))) ; for include files



reply via email to

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