nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "gnu: util-linux: Add "static" output." 

This reverts commit df887432be.
This commit is contained in:
David Thompson 2016-04-14 13:24:10 -04:00
parent e6f0ca2f05
commit 85c7e8e611
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/linux.scm
View File

@ -463,11 +463,12 @@ providing the system administrator with some help in common tasks.")
(("build_kill=yes") "build_kill=no")) (("build_kill=yes") "build_kill=no"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out"
"static")) ; >2 MiB of static .a libraries
(arguments (arguments
`(#:configure-flags (list "--disable-use-tty-group" `(#:configure-flags (list "--disable-use-tty-group"
;; Do not build .a files to save 2 MiB.
"--disable-static"
;; Install completions where our ;; Install completions where our
;; bash-completion package expects them. ;; bash-completion package expects them.
(string-append "--with-bashcompletiondir=" (string-append "--with-bashcompletiondir="
@ -492,19 +493,6 @@ providing the system administrator with some help in common tasks.")
(substitute* "tests/ts/misc/mcookie" (substitute* "tests/ts/misc/mcookie"
(("/etc/services") (("/etc/services")
(string-append net "/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)))))) #t))))))
(inputs `(("zlib" ,zlib) (inputs `(("zlib" ,zlib)
("ncurses" ,ncurses))) ("ncurses" ,ncurses)))