From 9a30b1f59bf7c216c0cd8838b175f2a4e9eb9ffb Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Wed, 18 Jun 2008 07:22:52 +0000 Subject: Fixed libiconv detection in glib. git-svn-id: http://svn.telesphoreo.org/trunk@328 514c082c-b64e-11dc-b46d-3d985efe055d --- data/glib/libiconv.diff | 17 +++++++++++++++++ data/glib/make.sh | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 data/glib/libiconv.diff (limited to 'data/glib') diff --git a/data/glib/libiconv.diff b/data/glib/libiconv.diff new file mode 100644 index 000000000..d299b3293 --- /dev/null +++ b/data/glib/libiconv.diff @@ -0,0 +1,17 @@ +diff -ru glib-2.12.13/glib/gconvert.c glib-2.12.13+iPhone/glib/gconvert.c +--- glib-2.12.13/glib/gconvert.c 2007-07-16 18:57:12.000000000 +0000 ++++ glib-2.12.13+iPhone/glib/gconvert.c 2008-06-18 04:14:55.000000000 +0000 +@@ -41,13 +41,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 +- + #include "galias.h" + + GQuark diff --git a/data/glib/make.sh b/data/glib/make.sh index 8ade5d147..53c375ecb 100644 --- a/data/glib/make.sh +++ b/data/glib/make.sh @@ -1,5 +1,5 @@ pkg:setup autoconf -pkg:configure glib_cv_stack_grows=no glib_cv_uscore=yes ac_cv_func_posix_getpwuid_r=yes +pkg:configure glib_cv_stack_grows=no glib_cv_uscore=yes ac_cv_func_posix_getpwuid_r=yes --with-libiconv=native make pkg:install -- cgit v1.2.3