diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-05-31 01:25:03 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-05-31 01:26:26 +0300 |
| commit | b61b156d52d24a7cfc42fb47d922bbc292bc6835 (patch) | |
| tree | d380a657f6f8a157db92be8d60eb6b466f827081 /glib/glib-2.28.1.patch | |
| parent | d49fe1968a4b5a3c79fa71177bcdeeb702db264e (diff) | |
Enable building glib for iOS
Pass --build and --host options to the configure script. Pass a bunch
of a priori cached test results for stuff that can't be determined
when cross-compiling. Link with the CoreFoundation framework. Build
static archives.
Patch out the compile-time USE_LIBICONV_GNU and _LIBICONV_H test from
gconvert.c as it for some reason fails for iOS.
Diffstat (limited to 'glib/glib-2.28.1.patch')
| -rw-r--r-- | glib/glib-2.28.1.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/glib/glib-2.28.1.patch b/glib/glib-2.28.1.patch index cadcc4db2cb8..da993817da7f 100644 --- a/glib/glib-2.28.1.patch +++ b/glib/glib-2.28.1.patch @@ -39,3 +39,20 @@ #include "gthreadprivate.h" /** +--- misc/glib-2.28.1/glib/gconvert.c ++++ misc/build/glib-2.28.1/glib/gconvert.c +@@ -58,13 +58,6 @@ + + #include "glibintl.h" + +-#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) +-#error GNU libiconv not in use but included iconv.h is from libiconv +-#endif +- + + /** + * SECTION:conversions + |