From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Geerinckx-Rice Subject: [PATCH 2/3] gnu: util-linux: Add "static" output. Date: Sat, 2 Apr 2016 15:29:33 +0200 Message-ID: <1459603774-9455-3-git-send-email-tobias.geerinckx.rice@gmail.com> References: <1459603774-9455-1-git-send-email-tobias.geerinckx.rice@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amLcl-0005Jn-R3 for guix-devel@gnu.org; Sat, 02 Apr 2016 09:30:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amLci-0000iI-HQ for guix-devel@gnu.org; Sat, 02 Apr 2016 09:29:59 -0400 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:36096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amLci-0000i8-A8 for guix-devel@gnu.org; Sat, 02 Apr 2016 09:29:56 -0400 Received: by mail-lf0-x243.google.com with SMTP id p81so9157452lfb.3 for ; Sat, 02 Apr 2016 06:29:56 -0700 (PDT) In-Reply-To: <1459603774-9455-1-git-send-email-tobias.geerinckx.rice@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * gnu/packages/linux.scm: (util-linux)[outputs]: New field. [arguments]: Remove "--disable-static" configure flag. Add 'move-static-libraries phase. --- gnu/packages/linux.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 917a4d2..0260b0e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -464,12 +464,11 @@ providing the system administrator with some help in common tasks.") (("build_kill=yes") "build_kill=no")) #t)))) (build-system gnu-build-system) + (outputs '("out" ; everything + "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=" @@ -494,6 +493,17 @@ 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 (f) + (rename-file f (string-append static "/" f))) + (find-files "lib" "\\.a$"))) #t)))))) (inputs `(("zlib" ,zlib) ("ncurses" ,ncurses))) -- 2.7.0