diff mbox

[11/11] gnu: guile-2.0: support mingw.

Message ID 87poso9yb9.fsf@drakenvlieg.flower
State New
Headers show

Commit Message

Jan Nieuwenhuizen May 14, 2016, 8:31 p.m. UTC
Andy Wingo writes:

Hi Andy,

What I meant to say in my first mail, I'll do in the last.  Thanks so
much again for this round of reviews!  It took me quite some rebuilds
to get sane answers to your remarks and there were some bugs that I
needed to get straightened out first, that's why I could not answer
sooner.

>> -   (native-inputs `(("pkgconfig" ,pkg-config)))
>> +   (native-inputs `(("pkgconfig" ,pkg-config)
>> +                    ,@(if (mingw-target?) `(("bash" ,bash)) '())))
>
> AFAIU we can remove the "bash" thing here, as we decided to punt on
> (ice-9 popen); sound right to you?

Indeed.  Tested without this addition and removed.  (This is about the
native, build-hosts' bash anyway.  I think including the build host bash
explicitly may have been necessary when I was creating the cross-build.)

>> +                       (if bash
>> +                           (string-append bash "/bin/bash")
>> +                           "bash")))))
>
> Needs a comment here explaining that although we should always have bash
> as an input, it isn't packaged yet on mingw so we are falling back to
> finding it in the run-time path if needed.

Added this comment

          ;; 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")
           (if bash
               (string-append bash "/bin/bash")
               "bash")))))

> FWIW although Windows doesn't support `fork', `open-process' should work
> in Windows, and we should therefore be able to get (ice-9 popen) working
> in Windows eventually.

Yes, I agree.
Greetings, Jan

Comments

Andy Wingo May 17, 2016, 7:46 a.m. UTC | #1
On Sat 14 May 2016 22:31, Jan Nieuwenhuizen <janneke@gnu.org> writes:

> From dfd0f3dbee2c0062b02c9f35c598d937c85ea614 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Sun, 24 Apr 2016 14:06:56 +0200
> Subject: [PATCH 11/11] gnu: guile-2.0: support mingw.

LGTM.  Thank you!
diff mbox

Patch

From dfd0f3dbee2c0062b02c9f35c598d937c85ea614 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Apr 2016 14:06:56 +0200
Subject: [PATCH 11/11] gnu: guile-2.0: support mingw.

* gnu/packages/guile.scm (guile-2.0): Support mingw.
---
 gnu/packages/guile.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 53ea3e5..b4ffe86 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -138,8 +138,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 (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
@@ -167,8 +167,13 @@  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 bash
+                           (string-append bash "/bin/bash")
+                           "bash")))))
                 %standard-phases)))
 
    (native-search-paths
-- 
2.7.3