From 2f8a123ed32eba2d63822327f86eadfba2c12143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 2 Jan 2013 23:40:56 +0100 Subject: [PATCH] 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. --- distro/packages/autotools.scm | 9 ++++++++- distro/packages/base.scm | 3 --- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/distro/packages/autotools.scm b/distro/packages/autotools.scm index 171855b9372623f9d8be1a6b8083a0375fdd89b8..32e50a5b1266fb21c5f7bfc71e62ff26b6a66282 100644 --- a/distro/packages/autotools.scm +++ b/distro/packages/autotools.scm @@ -1,6 +1,6 @@ ;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- ;;; Copyright (C) 2012 Nikita Karetnikov -;;; Copyright (C) 2012 Ludovic Courtès +;;; Copyright (C) 2012, 2013 Ludovic Courtès ;;; ;;; This file is part of Guix. ;;; @@ -99,6 +99,13 @@ Standards. Automake requires the use of Autoconf.") (build-system gnu-build-system) (native-inputs `(("m4" ,m4) ("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 `(#:patches (list (assoc-ref %build-inputs "patch/skip-tests")) #:phases (alist-cons-before diff --git a/distro/packages/base.scm b/distro/packages/base.scm index 2190fc528c06c065ba84114169a77a04af94f1a9..63eea603ef45c4405431e8e5481d498d05bef365 100644 --- a/distro/packages/base.scm +++ b/distro/packages/base.scm @@ -1034,9 +1034,6 @@ store.") ,@(alist-delete "bash" %boot3-inputs))) (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-explicit-inputs guile-2.0/fixed %boot4-inputs