[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Revert "gnu: util-linux: Add "static" output."
From: |
David Thompson |
Subject: |
01/01: Revert "gnu: util-linux: Add "static" output." |
Date: |
Thu, 14 Apr 2016 17:44:42 +0000 |
davexunit pushed a commit to branch master
in repository guix.
commit 85c7e8e611be1bdc2eed47e61e9ff45d92ab293d
Author: David Thompson <address@hidden>
Date: Thu Apr 14 13:24:10 2016 -0400
Revert "gnu: util-linux: Add "static" output."
This reverts commit df887432be25e1534b9ecdccf39c98857b1d0786.
---
gnu/packages/linux.scm | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 8659471..310bb57 100644
--- 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)
- (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="
@@ -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")))
- #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)))