From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH 2/3] gnu: util-linux: Add "static" output. Date: Sat, 2 Apr 2016 20:47:00 -0400 Message-ID: <20160403004700.GB4959@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: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amWC2-00013n-6n for guix-devel@gnu.org; Sat, 02 Apr 2016 20:47:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1amWBz-0000Kh-00 for guix-devel@gnu.org; Sat, 02 Apr 2016 20:47:06 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:48936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1amWBy-0000Kd-SD for guix-devel@gnu.org; Sat, 02 Apr 2016 20:47:02 -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." 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: Tobias Geerinckx-Rice 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. 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 > >