Mercurial > mxe-octave
changeset 1247:7cad1948b826
bugfixes for glib on OSX
| author | Tony Theodore <tonyt@logyst.com> |
|---|---|
| date | Sat, 02 Oct 2010 21:49:07 +1000 |
| parents | 8e21c194b7d3 |
| children | 58b080e6b26a |
| files | src/glib-2-darwin-config-libiconv.patch src/glib-3-apple-lp64-iconv.patch |
| diffstat | 2 files changed, 33 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glib-2-darwin-config-libiconv.patch Sat Oct 02 21:49:07 2010 +1000 @@ -0,0 +1,15 @@ +--- glib-2.25.17/configure.ac 2010-10-02 19:12:16.000000000 +1000 ++++ glib-2.25.17.native/configure.ac 2010-10-02 19:50:40.000000000 +1000 +@@ -374,6 +374,12 @@ + dnl + dnl We do this before the gettext checks, to avoid distortion + ++case $host in ++ *-*-darwin*) ++ with_libiconv=native ++ ;; ++esac ++ + dnl On Windows we use a native implementation + + if test x"$glib_native_win32" = xyes; then
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/glib-3-apple-lp64-iconv.patch Sat Oct 02 21:49:07 2010 +1000 @@ -0,0 +1,18 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +This patch has been taken from: +http://mail.gnome.org/archives/gtk-list/2009-August/msg00146.html + +diff -urN glib-2.25.17.orig/glib/gconvert.c glib-2.25.17/glib/gconvert.c +--- glib-2.25.17.orig/glib/gconvert.c 2010-09-14 01:57:51.000000000 +1000 ++++ glib-2.25.17/glib/gconvert.c 2010-09-27 22:51:58.000000000 +1000 +@@ -61,7 +61,7 @@ + #if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H) + #error GNU libiconv in use but included iconv.h not from libiconv + #endif +-#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) ++#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !(defined(__APPLE__) && defined(__LP64__)) + #error GNU libiconv not in use but included iconv.h is from libiconv + #endif +