diff options
author | Tony Theodore <tonyt@logyst.com> | 2014-10-10 04:45:44 (GMT) |
---|---|---|
committer | Tony Theodore <tonyt@logyst.com> | 2014-10-10 04:45:44 (GMT) |
commit | 6506b8c0334ae081c7b44c7c0ea894246987d081 (patch) | |
tree | e804fe3f810e4084184d617d15dc9eba751ac519 /src/guile-1-fixes.patch | |
parent | 108ffcc68e4856ff1471b3d9ca82f849600ff191 (diff) | |
download | mxe-6506b8c0334ae081c7b44c7c0ea894246987d081.zip mxe-6506b8c0334ae081c7b44c7c0ea894246987d081.tar.gz mxe-6506b8c0334ae081c7b44c7c0ea894246987d081.tar.bz2 |
guile: enable i686-w64-mingw32 build (see #492)
Diffstat (limited to 'src/guile-1-fixes.patch')
-rw-r--r-- | src/guile-1-fixes.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/src/guile-1-fixes.patch b/src/guile-1-fixes.patch new file mode 100644 index 0000000..50fb5e7 --- /dev/null +++ b/src/guile-1-fixes.patch @@ -0,0 +1,87 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 73756a80498d5c05f28bd4166c239e604125d9e4 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Fri, 10 Oct 2014 15:10:32 +1100 +Subject: [PATCH 1/2] original patch fixes + + +diff --git a/guile-readline/configure b/guile-readline/configure +index 3048732..9bee51b 100755 +--- a/guile-readline/configure ++++ b/guile-readline/configure +@@ -12086,7 +12086,7 @@ if test "$MINGW32" = "yes" ; then + fi + + +-for termlib in ncurses curses termcap terminfo termlib ; do ++for termlib in ncurses curses termcap terminfo termlib pdcurses ; do + as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgoto" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgoto in -l${termlib}" >&5 + $as_echo_n "checking for tgoto in -l${termlib}... " >&6; } +diff --git a/libguile/__scm.h b/libguile/__scm.h +index e75f1a9..2b5d159 100644 +--- a/libguile/__scm.h ++++ b/libguile/__scm.h +@@ -150,7 +150,7 @@ + which should be exported or imported in the resulting dynamic link + library (DLL) in the Win32 port. */ + +-#if defined (SCM_IMPORT) ++#if defined (SCM_IMPORT) && defined (USE_DLL_IMPORT) + # define SCM_API __declspec (dllimport) extern + #elif defined (SCM_EXPORT) || defined (DLL_EXPORT) + # define SCM_API __declspec (dllexport) extern +-- +1.9.3 (Apple Git-50) + + +From c63aecfe677d7e3d47457c54ce077cf509ad8961 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Fri, 10 Oct 2014 15:16:19 +1100 +Subject: [PATCH 2/2] fix mingw-w64 build + + +diff --git a/libguile/posix.c b/libguile/posix.c +index 2ecd8ae..a4e3562 100644 +--- a/libguile/posix.c ++++ b/libguile/posix.c +@@ -968,7 +968,7 @@ SCM_DEFINE (scm_execl, "execl", 1, 0, 1, + SCM_F_WIND_EXPLICITLY); + + execv (exec_file, +-#ifdef __MINGW32__ ++#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) + /* extra "const" in mingw formals, provokes warning from gcc */ + (const char * const *) + #endif +@@ -1004,7 +1004,7 @@ SCM_DEFINE (scm_execlp, "execlp", 1, 0, 1, + SCM_F_WIND_EXPLICITLY); + + execvp (exec_file, +-#ifdef __MINGW32__ ++#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) + /* extra "const" in mingw formals, provokes warning from gcc */ + (const char * const *) + #endif +@@ -1048,12 +1048,12 @@ SCM_DEFINE (scm_execle, "execle", 2, 0, 1, + SCM_F_WIND_EXPLICITLY); + + execve (exec_file, +-#ifdef __MINGW32__ ++#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) + /* extra "const" in mingw formals, provokes warning from gcc */ + (const char * const *) + #endif + exec_argv, +-#ifdef __MINGW32__ ++#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) + /* extra "const" in mingw formals, provokes warning from gcc */ + (const char * const *) + #endif +-- +1.9.3 (Apple Git-50) + |