me/guix
Archived
1
0
Fork 0
Code Activity

gnu: e2fsprogs: Use 'modify-phases' syntax.

Browse source 
* gnu/packages/linux.scm (e2fsprogs)[arguments]<#:phases>: Use 'modify-phases'.
This commit is contained in:
Marius Bakke 2017-05-10 15:47:29 +02:00
parent 62ec02bf21
commit 55acb372e3
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
gnu/packages/linux.scm
View file

@ -695,34 +695,34 @@ slabtop, and skill.")
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib")) "/lib"))
#:phases (alist-cons-before #:phases
'configure 'patch-shells (modify-phases %standard-phases
(lambda _ (add-before 'configure 'patch-shells
(substitute* "configure" (lambda _
(("/bin/sh (.*)parse-types.sh" _ dir) (substitute* "configure"
(string-append (which "sh") " " dir (("/bin/sh (.*)parse-types.sh" _ dir)
"parse-types.sh"))) (string-append (which "sh") " " dir
(substitute* (find-files "." "^Makefile.in$") "parse-types.sh")))
(("#!/bin/sh") (substitute* (find-files "." "^Makefile.in$")
(string-append "#!" (which "sh"))))) (("#!/bin/sh")
(alist-cons-after (string-append "#!" (which "sh"))))
'install 'install-libs #t))
(lambda* (#:key outputs #:allow-other-keys) (add-after 'install 'install-libs
(let* ((out (assoc-ref outputs "out")) (lambda* (#:key outputs #:allow-other-keys)
(lib (string-append out "/lib"))) (let* ((out (assoc-ref outputs "out"))
(and (zero? (system* "make" "install-libs")) (lib (string-append out "/lib")))
(and (zero? (system* "make" "install-libs"))
;; Make the .a writable so that 'strip' works. ;; Make the .a writable so that 'strip' works.
;; Failing to do that, due to debug symbols, we ;; Failing to do that, due to debug symbols, we
;; retain a reference to the final ;; retain a reference to the final
;; linux-libre-headers, which refer to the ;; linux-libre-headers, which refer to the
;; bootstrap binaries. ;; bootstrap binaries.
(let ((archives (find-files lib "\\.a$"))) (let ((archives (find-files lib "\\.a$")))
(for-each (lambda (file) (for-each (lambda (file)
(chmod file #o666)) (chmod file #o666))
archives) archives)
#t)))) #t))))))
%standard-phases))
;; FIXME: Tests work by comparing the stdout/stderr of programs, that ;; FIXME: Tests work by comparing the stdout/stderr of programs, that
;; they fail because we get an extra line that says "Can't check if ;; they fail because we get an extra line that says "Can't check if