me
/
guix
Archived
1
0
Fork 0
Code

gnu: guile-2.0: support mingw. 

* gnu/packages/guile.scm (guile-2.0): Support MinGW.
master
Jan Nieuwenhuizen 2016-04-24 14:06:56 +02:00 committed by Ludovic Courtès
parent ae12d58627
commit 88da729ff7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/guile.scm
View File

@ -146,8 +146,8 @@ without requiring the source code to be rewritten.")
(native-inputs `(("pkgconfig" ,pkg-config))) (native-inputs `(("pkgconfig" ,pkg-config)))
(inputs `(("libffi" ,libffi) (inputs `(("libffi" ,libffi)
("readline" ,readline) ("readline" ,readline)
("bash" ,bash))) ,@(libiconv-if-needed)
,@(if (target-mingw?) '() `(("bash" ,bash)))))
(propagated-inputs (propagated-inputs
`( ;; These ones aren't normally needed here, but since `libguile-2.0.la' `( ;; These ones aren't normally needed here, but since `libguile-2.0.la'
;; reads `-lltdl -lunistring', adding them here will add the needed ;; 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. ;; Tell (ice-9 popen) the file name of Bash.
(let ((bash (assoc-ref inputs "bash"))) (let ((bash (assoc-ref inputs "bash")))
(substitute* "module/ice-9/popen.scm" (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") (("/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))) %standard-phases)))
(native-search-paths (native-search-paths