[v2] Update btrfs-progs once again and add static output

[v2] Update btrfs-progs once again and add static output

[Tobias Geerinckx-Rice]

Hullo Guix,

Static btrfs-progs 4.5.1, with Leo's suggestions applied.

Regards,

T G-R

[PATCH v2 1/3] gnu: btrfs-progs: Update to 4.5.1.

[Tobias Geerinckx-Rice]

* gnu/packages/linux.scm (btrfs-progs): Update to 4.5.1.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3a4c9f1..917a4d2 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2487,7 +2487,7 @@ and copy/paste text in the console and in xterm.")
 (define-public btrfs-progs
   (package
     (name "btrfs-progs")
-    (version "4.4.1")
+    (version "4.5.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://kernel.org/linux/kernel/"
@@ -2495,7 +2495,7 @@ and copy/paste text in the console and in xterm.")
                                   "btrfs-progs-v" version ".tar.xz"))
               (sha256
                (base32
-                "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r"))))
+                "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f"))))
     (build-system gnu-build-system)
     (arguments
      '(#:test-target "test"
-- 
2.7.0

[PATCH v2 2/3] gnu: util-linux: Add "static" output.

[Tobias Geerinckx-Rice]

* gnu/packages/linux.scm: (util-linux)[outputs]: New field.
  [arguments]: Remove "--disable-static" configure flag.
  Add 'move-static-libraries phase.
---
 gnu/packages/linux.scm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 917a4d2..011f650 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)))
-- 
2.7.0

[PATCH v2 3/3] gnu: btrfs-progs: Add "static" output.

[Tobias Geerinckx-Rice]

* 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.
---
 gnu/packages/linux.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 011f650..ab72811 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)
-- 
2.7.0

Re: [v2] Update btrfs-progs once again and add static output

[Leo Famulari]

On Sun, Apr 03, 2016 at 09:36:26PM +0200, Tobias Geerinckx-Rice wrote:
> Hullo Guix,
> 
> Static btrfs-progs 4.5.1, with Leo's suggestions applied.

This LGTM! Any comments from anyone else?