guix-commits
[Top][All Lists]
Advanced

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

03/03: gnu: btrfs-progs: Add "static" output.


From: Leo Famulari
Subject: 03/03: gnu: btrfs-progs: Add "static" output.
Date: Tue, 12 Apr 2016 00:06:24 +0000

lfam pushed a commit to branch master
in repository guix.

commit 5f3f3ac287467994f01646680c6a6837ec7ee587
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Sun Apr 3 21:36:29 2016 +0200

    gnu: btrfs-progs: Add "static" output.
    
    * gnu/packages/linux.scm (btrfs-progs)[outputs]: New field.
    [inputs]: Add "static" outputs of util-linux for libuuid and libblkid.
    [arguments]: Add 'build-static' and 'install-static' phases.
    
    Signed-off-by: Leo Famulari <address@hidden>
---
 gnu/packages/linux.scm |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 6c669e3..2920298 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2509,12 +2509,26 @@ and copy/paste text in the console and in xterm.")
                (base32
                 "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f"))))
     (build-system gnu-build-system)
+    (outputs '("out"
+               "static"))      ; static versions of binaries in "out" (~16MiB!)
     (arguments
-     '(#:test-target "test"
+     '(#:phases (modify-phases %standard-phases
+                 (add-after 'build 'build-static
+                   (lambda _ (zero? (system* "make" "static"))))
+                 (add-after 'install 'install-static
+                   (let ((staticbin (string-append (assoc-ref %outputs 
"static")
+                                                  "/bin")))
+                     (lambda _
+                       (zero? (system* "make"
+                                       (string-append "bindir=" staticbin)
+                                       "install-static"))))))
+       #:test-target "test"
        #:parallel-tests? #f)) ; tests fail when run in parallel
     (inputs `(("e2fsprogs" ,e2fsprogs)
               ("libblkid" ,util-linux)
+              ("libblkid:static" ,util-linux "static")
               ("libuuid" ,util-linux)
+              ("libuuid:static" ,util-linux "static")
               ("zlib" ,zlib)
               ("lzo" ,lzo)))
     (native-inputs `(("pkg-config" ,pkg-config)



reply via email to

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