[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/11] gnu: guile-2.0: support mingw.
From: |
Jan Nieuwenhuizen |
Subject: |
[PATCH 11/11] gnu: guile-2.0: support mingw. |
Date: |
Sun, 8 May 2016 22:42:49 +0200 |
* gnu/packages/guile.scm (guile-2.0): Support mingw.
---
gnu/packages/guile.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 53ea3e5..3fd9ded 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -135,11 +135,12 @@ without requiring the source code to be rewritten.")
"1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f"))
(patches (search-patches "guile-arm-fixes.patch"))))
(build-system gnu-build-system)
- (native-inputs `(("pkgconfig" ,pkg-config)))
+ (native-inputs `(("pkgconfig" ,pkg-config)
+ ,@(if (mingw-target?) `(("bash" ,bash)) '())))
(inputs `(("libffi" ,libffi)
("readline" ,readline)
- ("bash" ,bash)))
-
+ ,@(libiconv-if-needed)
+ ,@(if (mingw-target?) '() `(("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
@@ -168,7 +169,9 @@ without requiring the source code to be rewritten.")
(let ((bash (assoc-ref inputs "bash")))
(substitute* "module/ice-9/popen.scm"
(("/bin/sh")
- (string-append bash "/bin/bash")))))
+ (if bash
+ (string-append bash "/bin/bash")
+ "bash")))))
%standard-phases)))
(native-search-paths
--
2.7.3
- Re: [PATCH 07/11] gnu: cross-base: Add cross-libtool., (continued)
[PATCH 10/11] gnu: readline: support mingw., Jan Nieuwenhuizen, 2016/05/08
[PATCH 09/11] gnu: ncurses: build mingw with libtool., Jan Nieuwenhuizen, 2016/05/08
[PATCH 08/11] gnu: libtool: support cross-libtool mingw., Jan Nieuwenhuizen, 2016/05/08
[PATCH 11/11] gnu: guile-2.0: support mingw.,
Jan Nieuwenhuizen <=