From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo Famulari <leo@famulari.name>
Subject: Re: [PATCH 2/3] gnu: util-linux: Add "static" output.
Date: Sat, 2 Apr 2016 20:53:57 -0400
Message-ID: <20160403005357.GF4959@jasmine>
References: <1459603774-9455-1-git-send-email-tobias.geerinckx.rice@gmail.com>
	<1459603774-9455-3-git-send-email-tobias.geerinckx.rice@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60385)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1amWIl-0002Cx-9w
	for guix-devel@gnu.org; Sat, 02 Apr 2016 20:54:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1amWIi-0001Cq-40
	for guix-devel@gnu.org; Sat, 02 Apr 2016 20:54:03 -0400
Received: from out3-smtp.messagingengine.com ([66.111.4.27]:50454)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1amWIh-0001Cl-Vd
	for guix-devel@gnu.org; Sat, 02 Apr 2016 20:54:00 -0400
Content-Disposition: inline
In-Reply-To: <1459603774-9455-3-git-send-email-tobias.geerinckx.rice@gmail.com>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=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: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Cc: guix-devel@gnu.org

On Sat, Apr 02, 2016 at 03:29:33PM +0200, Tobias Geerinckx-Rice wrote:
> * 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

How about calling the phase 'install-static' as in your btrfs-progs
patch?

> +                   (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
> 
>