unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH 2/3] gnu: util-linux: Add "static" output.
Date: Sat, 2 Apr 2016 20:47:00 -0400	[thread overview]
Message-ID: <20160403004700.GB4959@jasmine> (raw)
In-Reply-To: <1459603774-9455-3-git-send-email-tobias.geerinckx.rice@gmail.com>

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.

Cool, it's always interesting to see how someone else implements the
same change as you :)

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

"out" is not everything, since it doesn't include the static libraries.
How about just leaving "out" unlabeled? Or putting it 2nd in the list,
and labelling it "everything else"?

> +               "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$")))

How about using something like "file" instead of "f", just to help the
Scheme neophytes get their bearings while reading the code? ;)

>                         #t))))))
>      (inputs `(("zlib" ,zlib)
>                ("ncurses" ,ncurses)))
> -- 
> 2.7.0
> 
> 

  reply	other threads:[~2016-04-03  0:47 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-02 13:29 Update btrfs-progs once again and add static output Tobias Geerinckx-Rice
2016-04-02 13:29 ` [PATCH 1/3] gnu: btrfs-progs: Update to 4.5.1 Tobias Geerinckx-Rice
2016-04-03  0:51   ` Leo Famulari
2016-04-02 13:29 ` [PATCH 2/3] gnu: util-linux: Add "static" output Tobias Geerinckx-Rice
2016-04-03  0:47   ` Leo Famulari [this message]
2016-04-03  0:53   ` Leo Famulari
2016-04-03 18:29     ` Tobias Geerinckx-Rice
2016-04-03 19:21       ` Leo Famulari
2016-04-14 17:50         ` Thompson, David
2016-04-02 13:29 ` [PATCH 3/3] gnu: btrfs-progs: " Tobias Geerinckx-Rice
2016-04-03  0:50   ` Leo Famulari
2016-04-03  0:53 ` Update btrfs-progs once again and add static output Leo Famulari
2016-04-12  0:07 ` Leo Famulari
2016-04-12  7:13   ` Leo Famulari
2016-04-14 16:30     ` Ludovic Courtès
2016-04-14 18:58       ` Thompson, David
2016-04-15  1:34       ` Leo Famulari
2016-04-15 21:00         ` Ludovic Courtès
2016-04-16  1:11           ` Leo Famulari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160403004700.GB4959@jasmine \
    --to=leo@famulari.name \
    --cc=guix-devel@gnu.org \
    --cc=tobias.geerinckx.rice@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).