02/03: gnu: util-linux: Add "static" output.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

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

    gnu: util-linux: Add "static" output.
    
    * gnu/packages/linux.scm: (util-linux)[outputs]: New field.
    [arguments]: Remove "--disable-static" from #:configure-flags.
    Add 'move-static-libraries' phase.
    
    Signed-off-by: Leo Famulari <address@hidden>
---
 gnu/packages/linux.scm |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 02cde8e..6c669e3 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -464,12 +464,11 @@ providing the system administrator with some help in 
common tasks.")
                     (("build_kill=yes") "build_kill=no"))
                   #t))))
     (build-system gnu-build-system)
+    (outputs '("out"
+               "static"))      ; >2 MiB of static .a libraries
     (arguments
      `(#:configure-flags (list "--disable-use-tty-group"
 
-                               ;; Do not build .a files to save 2 MiB.
-                               "--disable-static"
-
                                ;; Install completions where our
                                ;; bash-completion package expects them.
                                (string-append "--with-bashcompletiondir="
@@ -494,6 +493,19 @@ providing the system administrator with some help in 
common tasks.")
                        (substitute* "tests/ts/misc/mcookie"
                          (("/etc/services")
                           (string-append net "/etc/services")))
+                       #t)))
+                  (add-after
+                   'install 'move-static-libraries
+                   (lambda* (#:key outputs #:allow-other-keys)
+                     (let ((out    (assoc-ref outputs "out"))
+                           (static (assoc-ref outputs "static")))
+                       (mkdir-p (string-append static "/lib"))
+                       (with-directory-excursion out
+                         (for-each (lambda (file)
+                                     (rename-file file
+                                                  (string-append static "/"
+                                                                 file)))
+                                   (find-files "lib" "\\.a$")))
                        #t))))))
     (inputs `(("zlib" ,zlib)
               ("ncurses" ,ncurses)))