From 9c782445fb62b96210e1c68981a9fba2b925c2fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 26 May 2013 23:45:59 +0200
Subject: [PATCH] gnu: guile: Add Bash as an input, to permit
cross-compilation.
* gnu/packages/guile.scm (guile-2.0): Add Bash as an input
when (%current-target-system) is true. Use %standard-cross-phases as
a basis when (%current-target-system) is true.
---
gnu/packages/guile.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 757fa997e0b..48d10cc9f86 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -19,6 +19,7 @@
(define-module (gnu packages guile)
#:use-module (guix licenses)
#:use-module (gnu packages)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gperf)
@@ -115,7 +116,12 @@ (define-public guile-2.0
(build-system gnu-build-system)
(native-inputs `(("pkgconfig" ,pkg-config)))
(inputs `(("libffi" ,libffi)
- ("readline" ,readline)))
+ ("readline" ,readline)
+
+ ;; TODO: On next core-updates, make Bash input unconditional.
+ ,@(if (%current-target-system)
+ `(("bash" ,bash))
+ '())))
(propagated-inputs
`( ;; These ones aren't normally needed here, but since `libguile-2.0.la'
@@ -133,14 +139,16 @@ (define-public guile-2.0
(self-native-input? #t)
(arguments
- '(#:phases (alist-cons-before
+ `(#:phases (alist-cons-before
'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
(let ((bash (assoc-ref inputs "bash")))
(substitute* "module/ice-9/popen.scm"
(("/bin/sh")
(string-append bash "/bin/bash")))))
- %standard-phases)))
+ ,(if (%current-target-system)
+ '%standard-cross-phases
+ '%standard-phases))))
(native-search-paths
(list (search-path-specification
--
GitLab