nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

distro: libtool: Add a "bin" output. 

* distro/packages/autotools.scm (libtool): Add a "bin" output.
* distro/packages/base.scm (guile-final): Remove comment about retained
  dependency.
This commit is contained in:
Ludovic Courtès 2013-01-02 23:40:56 +01:00
parent feddc16c70
commit 2f8a123ed3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
distro/packages/autotools.scm
View File

@ -1,6 +1,6 @@
;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- ;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*-
;;; Copyright (C) 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright (C) 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org> ;;; Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of Guix. ;;; This file is part of Guix.
;;; ;;;
@ -99,6 +99,13 @@ Standards. Automake requires the use of Autoconf.")
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("m4" ,m4) (native-inputs `(("m4" ,m4)
("perl" ,perl))) ("perl" ,perl)))
;; Separate binaries from the rest. During bootstrap, only ltdl is
;; used; not depending on the binaries allows us to avoid retaining
;; a reference to the bootstrap bash.
(outputs '("bin" ; libtoolize, libtool, etc.
"out")) ; libltdl.so, ltdl.h, etc.
(arguments (arguments
`(#:patches (list (assoc-ref %build-inputs "patch/skip-tests")) `(#:patches (list (assoc-ref %build-inputs "patch/skip-tests"))
#:phases (alist-cons-before #:phases (alist-cons-before

3
distro/packages/base.scm
View File

@ -1034,9 +1034,6 @@ store.")
,@(alist-delete "bash" %boot3-inputs))) ,@(alist-delete "bash" %boot3-inputs)))
(define-public guile-final (define-public guile-final
;; FIXME: The Libtool used here, specifically its `bin/libtool' script,
;; holds a dependency on the bootstrap Binutils. Use multiple outputs for
;; Libtool, so that that dependency is isolated in the "bin" output.
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package-with-explicit-inputs guile-2.0/fixed (package-with-explicit-inputs guile-2.0/fixed
%boot4-inputs %boot4-inputs