[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: guile 2.0.9 build on mingw
From: |
Eli Zaretskii |
Subject: |
Re: guile 2.0.9 build on mingw |
Date: |
Thu, 13 Jun 2013 16:33:58 +0300 |
Here are a few more changes that fix problems exposed by the test
suite.
The patch below, which should be applied on top of the one I sent
yesterday, is needed because open-pipe does this:
(open-pipe* mode "/bin/sh" "-c" command))
and obviously there's no /bin/sh on Windows.
--- libguile/posix.c~1 2013-06-13 08:54:44.926293300 +0300
+++ libguile/posix.c 2013-06-13 08:57:44.262743700 +0300
@@ -1300,7 +1300,9 @@ scm_open_process (SCM mode, SCM prog, SC
int pid;
char *exec_file;
char **exec_argv;
+#ifdef HAVE_FORK
int max_fd = 1024;
+#endif
exec_file = scm_to_locale_string (prog);
exec_argv = scm_i_allocate_string_pointers (scm_cons (prog, args));
@@ -1435,6 +1437,14 @@ scm_open_process (SCM mode, SCM prog, SC
close (p2c[0]);
}
+ if (c_strcasecmp (exec_file, "/bin/sh") == 0)
+ {
+ strcpy (exec_file, "cmd.exe");
+ strcpy (exec_argv[0], "cmd.exe");
+ if (strcmp (exec_argv[1], "-c") == 0)
+ strcpy (exec_argv[1], "/c");
+ }
+
pid = spawnvp (P_NOWAIT, exec_file, exec_argv);
errno_save = errno;
@@ -1486,7 +1496,6 @@ scm_open_process (SCM mode, SCM prog, SC
{
int errno_save = errno;
- free (exec_file);
if (reading)
{
close (c2p[0]);
@@ -1512,6 +1521,7 @@ scm_open_process (SCM mode, SCM prog, SC
exec_file, msg);
}
#endif
+ free (exec_file);
SCM_SYSERROR;
}
@@ -1592,9 +1602,9 @@ scm_open_process (SCM mode, SCM prog, SC
}
_exit (EXIT_FAILURE);
+#endif /* HAVE_FORK */
/* Not reached. */
return SCM_BOOL_F;
-#endif /* HAVE_FORK */
}
#undef FUNC_NAME
The tests in foreign.test failed because they need to be able to call
C functions in Guile itself. According to libtool documentation, this
requires to link with -export-dynamic, so this is needed:
--- libguile/Makefile.am~ 2013-04-03 15:11:28.000000000 +0300
+++ libguile/Makefile.am 2013-06-13 13:34:27.545323200 +0300
@@ -113,7 +113,7 @@
guile_SOURCES = guile.c
guile_CFLAGS = $(GUILE_CFLAGS) $(AM_CFLAGS)
guile_LDADD = address@hidden@.la
-guile_LDFLAGS = $(GUILE_CFLAGS)
+guile_LDFLAGS = $(GUILE_CFLAGS) -export-dynamic
address@hidden@_la_CFLAGS = $(GUILE_CFLAGS) $(AM_CFLAGS)
The following patch prevents test failure on systems that don't
support symlinks, and thus test-symlink file is not created and does
not exist there.
--- test-suite/tests/filesys.test~0 2013-04-09 09:52:31.000000000 +0300
+++ test-suite/tests/filesys.test 2013-06-13 07:49:51.567974100 +0300
@@ -222,4 +222,5 @@
(throw 'unresolved)))))
(delete-file (test-file))
-(delete-file (test-symlink))
+(if (file-exists? (test-symlink))
+ (delete-file (test-symlink)))
Thanks.
- Re: guile 2.0.9 build on mingw, (continued)
- Re: guile 2.0.9 build on mingw, Eli Zaretskii, 2013/06/11
- Re: guile 2.0.9 build on mingw, Ludovic Courtès, 2013/06/11
- Re: guile 2.0.9 build on mingw, Eli Zaretskii, 2013/06/12
- Why launch the Guile signal delivery thread on exit? (was Re: guile 2.0.9 build on mingw), Mark H Weaver, 2013/06/18
- Re: Why launch the Guile signal delivery thread on exit? (was Re: guile 2.0.9 build on mingw), Eli Zaretskii, 2013/06/19
- Re: Why launch the Guile signal delivery thread on exit? (was Re: guile 2.0.9 build on mingw), Julian Graham, 2013/06/19
- Re: Why launch the Guile signal delivery thread on exit? (was Re: guile 2.0.9 build on mingw), Ludovic Courtès, 2013/06/19
- Re: guile 2.0.9 build on mingw, Eli Zaretskii, 2013/06/12
- Re: guile 2.0.9 build on mingw, Eli Zaretskii, 2013/06/13
- Re: guile 2.0.9 build on mingw, Ludovic Courtès, 2013/06/16
- Re: guile 2.0.9 build on mingw,
Eli Zaretskii <=
- Re: guile 2.0.9 build on mingw, Ludovic Courtès, 2013/06/16
- Re: guile 2.0.9 build on mingw, Eli Zaretskii, 2013/06/16
- Re: guile 2.0.9 build on mingw, Ludovic Courtès, 2013/06/16
- Re: guile 2.0.9 build on mingw, Eli Zaretskii, 2013/06/16
- Re: guile 2.0.9 build on mingw, Ludovic Courtès, 2013/06/16
- Re: guile 2.0.9 build on mingw, Eli Zaretskii, 2013/06/13
- Re: guile 2.0.9 build on mingw, Ludovic Courtès, 2013/06/16
- Re: guile 2.0.9 build on mingw, Eli Zaretskii, 2013/06/17
- Re: guile 2.0.9 build on mingw, Ludovic Courtès, 2013/06/18
- Re: guile 2.0.9 build on mingw, Mark H Weaver, 2013/06/18