02/04: gnu: e2fsprogs: Remove references to linux-libre-headers.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 853c2f18e7c374cfd991bfc11832497e00349ed5
Author: Ludovic Courtès <address@hidden>
Date:   Wed May 13 22:08:56 2015 +0200

    gnu: e2fsprogs: Remove references to linux-libre-headers.
    
    This removes the final linux-libre-headers and its references (including
    bootstrap-binaries) from the closure.
    
    * gnu/packages/linux.scm (e2fsprogs)[arguments]: Augment 'install-libs'
      phase to make .a files writable.
---
 gnu/packages/linux.scm |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 5da3979..1ef473f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -577,8 +577,21 @@ slabtop, and skill.")
                       (string-append "#!" (which "sh")))))
                  (alist-cons-after
                   'install 'install-libs
-                  (lambda _
-                    (zero? (system* "make" "install-libs")))
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (let* ((out (assoc-ref outputs "out"))
+                           (lib (string-append out "/lib")))
+                      (and (zero? (system* "make" "install-libs"))
+
+                           ;; Make the .a writable so that 'strip' works.
+                           ;; Failing to do that, due to debug symbols, we
+                           ;; retain a reference to the final
+                           ;; linux-libre-headers, which refer to the
+                           ;; bootstrap binaries.
+                           (let ((archives (find-files lib "\\.a$")))
+                             (for-each (lambda (file)
+                                         (chmod file #o666))
+                                       archives)
+                             #t))))
                   %standard-phases))
 
        ;; FIXME: Tests work by comparing the stdout/stderr of programs, that