From: Jan Nieuwenhuizen <janneke@gnu.org>
To: guix-devel@gnu.org
Subject: [PATCH 11/11] gnu: guile-2.0: support mingw.
Date: Sun, 8 May 2016 22:42:49 +0200 [thread overview]
Message-ID: <1462740169-15029-12-git-send-email-janneke@gnu.org> (raw)
In-Reply-To: <1462740169-15029-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-05-08 20:43 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-08 20:42 mingw guile.exe cross build patch series v8 Jan Nieuwenhuizen
2016-05-08 20:42 ` [PATCH 01/11] gnu: Add mingw-w64 Jan Nieuwenhuizen
2016-05-09 7:07 ` Andy Wingo
2016-05-08 20:42 ` [PATCH 02/11] gnu: cross-build: i686-w64-mingw32: new cross target Jan Nieuwenhuizen
2016-05-09 7:15 ` Andy Wingo
2016-05-14 20:27 ` Jan Nieuwenhuizen
2016-05-17 7:43 ` Andy Wingo
2016-05-17 22:30 ` Jan Nieuwenhuizen
2016-05-18 7:27 ` Andy Wingo
2016-05-19 22:16 ` Jan Nieuwenhuizen
2016-05-08 20:42 ` [PATCH 03/11] gnu: Add function libiconv-if-needed Jan Nieuwenhuizen
2016-05-09 7:16 ` Andy Wingo
2016-05-14 20:27 ` Jan Nieuwenhuizen
2016-05-17 7:44 ` Andy Wingo
2016-05-08 20:42 ` [PATCH 04/11] gnu: libunistring: support mingw: propagate libiconv if needed Jan Nieuwenhuizen
2016-05-09 7:17 ` Andy Wingo
2016-05-08 20:42 ` [PATCH 05/11] gnu: gmp: build shared library for mingw Jan Nieuwenhuizen
2016-05-09 7:20 ` Andy Wingo
2016-05-14 20:27 ` Jan Nieuwenhuizen
2016-05-08 20:42 ` [PATCH 06/11] gnu: ncurses: support mingw Jan Nieuwenhuizen
2016-05-09 7:23 ` Andy Wingo
2016-05-08 20:42 ` [PATCH 07/11] gnu: cross-base: Add cross-libtool Jan Nieuwenhuizen
2016-05-09 7:29 ` Andy Wingo
2016-05-14 20:26 ` Jan Nieuwenhuizen
2016-05-17 7:21 ` Andy Wingo
2016-05-08 20:42 ` [PATCH 08/11] gnu: libtool: support cross-libtool mingw Jan Nieuwenhuizen
2016-05-09 7:39 ` Andy Wingo
2016-05-14 20:27 ` Jan Nieuwenhuizen
2016-05-08 20:42 ` [PATCH 09/11] gnu: ncurses: build mingw with libtool Jan Nieuwenhuizen
2016-05-09 7:44 ` Andy Wingo
2016-05-08 20:42 ` [PATCH 10/11] gnu: readline: support mingw Jan Nieuwenhuizen
2016-05-09 7:44 ` Andy Wingo
2016-05-08 20:42 ` Jan Nieuwenhuizen [this message]
2016-05-09 7:48 ` [PATCH 11/11] gnu: guile-2.0: " Andy Wingo
2016-05-14 20:31 ` Jan Nieuwenhuizen
2016-05-17 7:46 ` Andy Wingo
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462740169-15029-12-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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.