HCoop
/
jackhill
/
guix
/
guix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e6f0ca2
)
Revert "gnu: util-linux: Add "static" output."
author
David Thompson
<dthompson2@worcester.edu>
Thu, 14 Apr 2016 17:24:10 +0000
(13:24 -0400)
committer
David Thompson
<dthompson2@worcester.edu>
Thu, 14 Apr 2016 17:24:10 +0000
(13:24 -0400)
This reverts commit
df887432be25e1534b9ecdccf39c98857b1d0786
.
gnu/packages/linux.scm
patch
|
blob
|
blame
|
history
diff --git
a/gnu/packages/linux.scm
b/gnu/packages/linux.scm
index
8659471
..
310bb57
100644
(file)
--- a/
gnu/packages/linux.scm
+++ b/
gnu/packages/linux.scm
@@
-463,11
+463,12
@@
providing the system administrator with some help in common tasks.")
(("build_kill=yes") "build_kill=no"))
#t))))
(build-system gnu-build-system)
(("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"
(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="
;; Install completions where our
;; bash-completion package expects them.
(string-append "--with-bashcompletiondir="
@@
-492,19
+493,6
@@
providing the system administrator with some help in common tasks.")
(substitute* "tests/ts/misc/mcookie"
(("/etc/services")
(string-append net "/etc/services")))
(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)))
#t))))))
(inputs `(("zlib" ,zlib)
("ncurses" ,ncurses)))