Mercurial > gub
changeset 6470:f1b28c608b3a
guile: never use gnulib's putenv. Fixes env-related bugs such as pango fonts.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Tue, 01 Feb 2011 23:59:39 +0100 |
| parents | f0ee9df1e3f2 |
| children | 834c939b7f86 |
| files | gub/specs/guile.py patches/guile-1.9.14-mingw-readdir.patch |
| diffstat | 2 files changed, 60 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/guile.py Tue Feb 01 15:24:46 2011 +0100 +++ b/gub/specs/guile.py Tue Feb 01 23:59:39 2011 +0100 @@ -57,6 +57,9 @@ -I. -I%(srcdir)s/libguile" ''')) + config_cache_overrides = target.AutoBuild.config_cache_overrides + ''' +gl_cv_func_svid_putenv=yes +''' # FIXME: guile runs gen_scmconfig [when not x-building also guile] # without setting the proper LD_LIBRARY_PATH. compile_flags_native = (' LD_PRELOAD= '
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/guile-1.9.14-mingw-readdir.patch Tue Feb 01 23:59:39 2011 +0100 @@ -0,0 +1,57 @@ +--- guile-1.9.14/libguile/win32-dirent.h~ 2010-12-14 19:15:17.000000000 +0100 ++++ guile-1.9.14/libguile/win32-dirent.h 2011-01-31 16:05:01.703196058 +0100 +@@ -27,6 +27,14 @@ + + #include <sys/types.h> + ++#define opendir guile_opendir ++#define readdir guile_readdir ++#define closedir guile_closedir ++#define rewinddir guile_rewinddir ++#define seekdir guile_seekdir ++#define telldir guile_telldir ++#define dirfd guile_dirfd ++ + struct dirstream + { + int fd; /* File descriptor. */ +--- guile-1.9.14/libguile/win32-dirent.c~ 2010-12-14 19:15:17.000000000 +0100 ++++ guile-1.9.14/libguile/win32-dirent.c 2011-01-31 16:10:06.336659077 +0100 +@@ -20,14 +20,14 @@ + # include <config.h> + #endif + ++#include "win32-dirent.h" ++ + #include "libguile/__scm.h" + + #include <windows.h> + #include <stdio.h> + #include <string.h> + +-#include "win32-dirent.h" +- + DIR * + opendir (const char * name) + { +--- guile-1.9.14/libguile/filesys.c~ 2011-01-30 17:50:22.565848118 +0100 ++++ guile-1.9.14/libguile/filesys.c 2011-01-31 16:11:02.599078648 +0100 +@@ -35,6 +35,10 @@ + #include <stdio.h> + #include <errno.h> + ++#if defined (__MINGW32__) || defined (_MSC_VER) || defined (__BORLANDC__) ++# include "win32-dirent.h" ++#endif /* __MINGW32__ || _MSC_VER || __BORLANDC__ */ ++ + #include "libguile/_scm.h" + #include "libguile/smob.h" + #include "libguile/feature.h" +@@ -94,7 +98,6 @@ + + + #if defined (__MINGW32__) || defined (_MSC_VER) || defined (__BORLANDC__) +-# include "win32-dirent.h" + # define NAMLEN(dirent) strlen((dirent)->d_name) + /* The following bits are per AC_HEADER_DIRENT doco in the autoconf manual */ + #elif HAVE_DIRENT_H