From: Jan Nieuwenhuizen <janneke@gnu.org>
To: guix-devel@gnu.org
Subject: [PATCH 10/10] gnu: guile-2.0: support mingw.
Date: Fri, 29 Apr 2016 17:12:31 +0200 [thread overview]
Message-ID: <1461942751-23883-10-git-send-email-janneke@gnu.org> (raw)
In-Reply-To: <1461942751-23883-1-git-send-email-janneke@gnu.org>
* 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
next prev parent reply other threads:[~2016-04-29 15:13 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-29 15:12 [PATCH 01/10] gnu: cross: Use CROSS_*_INCLUDE_PATH for system headers Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 02/10] gnu: bootstrap: Add i686-mingw Jan Nieuwenhuizen
2016-04-29 15:34 ` Manolis Ragkousis
2016-04-29 18:28 ` Jan Nieuwenhuizen
2016-05-01 11:02 ` Manolis Ragkousis
2016-04-29 15:12 ` [PATCH 03/10] gnu: Add mingw-w64 Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 04/10] gnu: cross-build: i686-w64-mingw32: new cross target Jan Nieuwenhuizen
2016-05-02 8:06 ` Andy Wingo
2016-05-02 18:34 ` Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 05/10] gnu: gmp: build shared library for mingw Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 06/10] gnu: Add libiconv Jan Nieuwenhuizen
2016-05-01 17:07 ` Manolis Ragkousis
2016-05-01 17:43 ` John Darrington
2016-05-01 18:58 ` Jan Nieuwenhuizen
2016-05-01 19:07 ` John Darrington
2016-05-03 12:19 ` Ludovic Courtès
2016-05-01 18:27 ` Jan Nieuwenhuizen
2016-05-03 12:20 ` Ludovic Courtès
2016-05-03 16:55 ` [PATCH 06a/10] " Jan Nieuwenhuizen
2016-05-05 14:56 ` Ludovic Courtès
2016-05-03 16:56 ` [PATCH 06b/10] gnu: Add function libiconv-if-needed Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 07/10] gnu: ncurses: support mingw Jan Nieuwenhuizen
2016-05-02 8:09 ` Andy Wingo
2016-05-02 18:41 ` Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 08/10] gnu: readline: " Jan Nieuwenhuizen
2016-05-02 8:12 ` Andy Wingo
2016-05-02 18:52 ` Jan Nieuwenhuizen
2016-05-02 19:25 ` Jan Nieuwenhuizen
2016-04-29 15:12 ` [PATCH 09/10] gnu: libunistring: support mingw: propagate libiconv if needed Jan Nieuwenhuizen
2016-04-29 15:12 ` Jan Nieuwenhuizen [this message]
2016-05-02 8:04 ` [PATCH 01/10] gnu: cross: Use CROSS_*_INCLUDE_PATH for system headers Andy Wingo
2016-05-02 17:59 ` Jan Nieuwenhuizen
2016-05-03 12:06 ` Ludovic Courtès
2016-05-03 13:27 ` Andy Wingo
2016-05-03 12:16 ` Ludovic Courtès
2016-05-14 5:29 ` Mark H Weaver
2016-05-14 6:37 ` Jan Nieuwenhuizen
2016-05-14 8:25 ` FIXUP: " Jan Nieuwenhuizen
2016-05-14 20:05 ` Ludovic Courtès
2016-05-14 20:50 ` Jan Nieuwenhuizen
2016-05-16 21:02 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1461942751-23883-10-git-send-email-janneke@gnu.org \
--to=janneke@gnu.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).