[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/12] gnu: guile-2.0: support mingw.
From: |
Jan Nieuwenhuizen |
Subject: |
[PATCH 12/12] gnu: guile-2.0: support mingw. |
Date: |
Thu, 18 Aug 2016 08:08:51 +0200 |
* 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 f26cc22..ee84c05 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -143,8 +143,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
@@ -173,8 +173,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
--
2.9.2
- [PATCH 02/12] gnu: Add mingw-w64., (continued)
- [PATCH 02/12] gnu: Add mingw-w64., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 03/12] gnu: cross-build: i686-w64-mingw32: new cross target., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 04/12] gnu: Add function libiconv-if-needed., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 05/12] gnu: libunistring: support mingw: propagate libiconv if needed., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 06/12] gnu: gmp: build shared library for mingw., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 08/12] gnu: cross-base: Add cross-libtool., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 09/12] gnu: libtool: support cross-libtool mingw., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 07/12] gnu: ncurses: support mingw., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 12/12] gnu: guile-2.0: support mingw.,
Jan Nieuwenhuizen <=
- [PATCH 01/12] gnu: Add gcc-cross-x86_64 packages for testing., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 10/12] gnu: ncurses: build mingw with libtool., Jan Nieuwenhuizen, 2016/08/18
- [PATCH 11/12] gnu: readline: support mingw., Jan Nieuwenhuizen, 2016/08/18