[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/10: gnu: guile-2.0: support mingw.
From: |
Ludovic Courtès |
Subject: |
09/10: gnu: guile-2.0: support mingw. |
Date: |
Wed, 7 Dec 2016 09:23:37 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 88da729ff78676c61a225956af92d2c8e95b7643
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sun Apr 24 14:06:56 2016 +0200
gnu: guile-2.0: support mingw.
* gnu/packages/guile.scm (guile-2.0): Support MinGW.
---
gnu/packages/guile.scm | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 4572544..1c1b35c 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -146,8 +146,8 @@ without requiring the source code to be rewritten.")
(native-inputs `(("pkgconfig" ,pkg-config)))
(inputs `(("libffi" ,libffi)
("readline" ,readline)
- ("bash" ,bash)))
-
+ ,@(libiconv-if-needed)
+ ,@(if (target-mingw?) '() `(("bash" ,bash)))))
(propagated-inputs
`( ;; These ones aren't normally needed here, but since `libguile-2.0.la'
;; reads `-lltdl -lunistring', adding them here will add the needed
@@ -176,8 +176,15 @@ without requiring the source code to be rewritten.")
;; Tell (ice-9 popen) the file name of Bash.
(let ((bash (assoc-ref inputs "bash")))
(substitute* "module/ice-9/popen.scm"
+ ;; If bash is #f allow fallback for user to provide
+ ;; "bash" in PATH. This happens when cross-building to
+ ;; MinGW for which we do not have Bash yet.
(("/bin/sh")
- (string-append bash "/bin/bash")))))
+ ,@(if (target-mingw?)
+ '((if bash
+ (string-append bash "/bin/bash")
+ "bash"))
+ '((string-append bash "/bin/bash")))))))
%standard-phases)))
(native-search-paths
- branch master updated (4908ae4 -> dea9110), Ludovic Courtès, 2016/12/07
- 05/10: gnu: libunistring: support mingw: propagate libiconv if needed., Ludovic Courtès, 2016/12/07
- 10/10: hydra: Add "i686-w64-mingw32" as a cross-compilation target., Ludovic Courtès, 2016/12/07
- 04/10: gnu: Add function libiconv-if-needed., Ludovic Courtès, 2016/12/07
- 01/10: doc: Correct example for 'wpa-supplicant-service-type'., Ludovic Courtès, 2016/12/07
- 06/10: gnu: gmp: build shared library for mingw., Ludovic Courtès, 2016/12/07
- 09/10: gnu: guile-2.0: support mingw.,
Ludovic Courtès <=
- 08/10: gnu: readline: support mingw., Ludovic Courtès, 2016/12/07
- 07/10: gnu: ncurses: support mingw., Ludovic Courtès, 2016/12/07
- 03/10: gnu: cross-base: Add i686-w64-mingw32 target., Ludovic Courtès, 2016/12/07
- 02/10: gnu: Add mingw-w64., Ludovic Courtès, 2016/12/07