diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-01-02 23:12:27 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-02 23:12:27 +0100 |
| commit | feddc16c70d8271425563ceea9ca59c274279d0d (patch) | |
| tree | 2cc29844d8f1df5adf488cdd3d35876eefe48a44 | |
| parent | 8ba8aeb74d3f45fb46a69d2278086e3a44845b4a (diff) | |
| download | patches-feddc16c70d8271425563ceea9ca59c274279d0d.tar patches-feddc16c70d8271425563ceea9ca59c274279d0d.tar.gz | |
distro: ncurses: Don't retain a reference to the bootstrap Bash.
* distro/packages/ncurses.scm (ncurses): Remove #:patch-shebangs?
argument since it now has no effect. Simplify PATCH-MAKEFILE-PHASE.
Add `configure-phase', and use it.
| -rw-r--r-- | distro/packages/ncurses.scm | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/distro/packages/ncurses.scm b/distro/packages/ncurses.scm index 8bde3c1989..62f957ef13 100644 --- a/distro/packages/ncurses.scm +++ b/distro/packages/ncurses.scm @@ -1,5 +1,5 @@ ;;; Guix --- Nix package management from Guile. -*- coding: utf-8 -*- -;;; 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. ;;; @@ -26,8 +26,23 @@ (define-public ncurses (let ((patch-makefile-phase '(lambda _ - (substitute* (find-files "." "Makefile.in") - (("^SHELL[[:blank:]]*=.*$") "")))) + (for-each patch-makefile-SHELL + (find-files "." "Makefile.in")))) + (configure-phase + '(lambda* (#:key inputs outputs configure-flags + #:allow-other-keys) + ;; The `ncursesw5-config' has a #!/bin/sh. We want to patch + ;; it to point to libc's embedded Bash, to avoid retaining a + ;; reference to the bootstrap Bash. + (let* ((libc (assoc-ref inputs "libc")) + (bash (string-append libc "/bin/bash")) + (out (assoc-ref outputs "out"))) + (format #t "configure flags: ~s~%" configure-flags) + (zero? (apply system* bash "./configure" + (string-append "SHELL=" bash) + (string-append "CONFIG_SHELL=" bash) + (string-append "--prefix=" out) + configure-flags))))) (post-install-phase '(lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -90,11 +105,10 @@ (alist-cons-before 'configure 'patch-makefile-SHELL ,patch-makefile-phase - %standard-phases)) - - ;; The `ncursesw5-config' has a #!/bin/sh that we don't want to - ;; patch, to avoid retaining a reference to the build-time Bash. - #:patch-shebangs? #f)) + (alist-replace + 'configure + ,configure-phase + %standard-phases))))) ((system cross-system) (arguments cross-system)))) (self-native-input? #t) |