Mercurial > gub
changeset 6485:919f33e40679
mingw::guile: fix socket and compiling.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Thu, 03 Feb 2011 23:57:03 +0100 |
| parents | 3553d0ab3a25 |
| children | 7a841bb2369b |
| files | gub/specs/guile.py patches/guile-1.9.15-mingw-compile.patch patches/guile-1.9.15-mingw-fports.patch |
| diffstat | 3 files changed, 28 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/guile.py Thu Feb 03 21:22:01 2011 +0100 +++ b/gub/specs/guile.py Thu Feb 03 23:57:03 2011 +0100 @@ -178,6 +178,8 @@ 'guile-1.9.14-gnulib-mingw.patch', 'guile-1.9.14-mingw-dirent.patch', #'guile-1.9.14-gnulib-libunistring-retooled.patch', + 'guile-1.9.15-mingw-compile.patch', + 'guile-1.9.15-mingw-fports.patch', ] dependencies = (Guile.dependencies + [
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/guile-1.9.15-mingw-compile.patch Thu Feb 03 23:57:03 2011 +0100 @@ -0,0 +1,10 @@ +--- guile-1.9.15/module/system/base/compile.scm~ 2011-01-26 23:03:16.000000000 +0100 ++++ guile-1.9.15/module/system/base/compile.scm 2011-02-03 23:29:08.090142894 +0100 +@@ -104,6 +104,7 @@ + %compile-fallback-path + ;; no need for '/' separator here, canonicalize-path + ;; will give us an absolute path ++ "/" ;; which does not start with / on MINGW + (canonicalize-path file) + (compiled-extension)))) + (and (false-if-exception (ensure-writable-dir (dirname f)))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/guile-1.9.15-mingw-fports.patch Thu Feb 03 23:57:03 2011 +0100 @@ -0,0 +1,16 @@ +--- guile-1.9.15/libguile/fports.c~ 2011-02-03 23:32:32.643031297 +0100 ++++ guile-1.9.15/libguile/fports.c 2011-02-03 23:37:56.194764854 +0100 +@@ -503,8 +503,11 @@ static int getflags (int fdes) + { + /* Or an anonymous pipe handle ? */ + if (buf.st_mode & _S_IFIFO) +- flags = PeekNamedPipe ((HANDLE) _get_osfhandle (fdes), NULL, 0, +- NULL, NULL, NULL) ? O_RDONLY : O_WRONLY; ++ { ++ flags = PeekNamedPipe ((HANDLE) _get_osfhandle (fdes), NULL, 0, ++ NULL, NULL, NULL) ? O_RDONLY : O_WRONLY; ++ flags = O_WRONLY; ++ } + /* stdin ? */ + else if (fdes == fileno (stdin) && isatty (fdes)) + flags = O_RDONLY;