b273aad66e
"macos", to fix some bugs, to use "sudo" if necessary when installing, to make the library version numbers variables, and to download the optional libraries, by default, as well. Also add his patches to make GLib build and work. Update README.macos to reflect that. svn path=/trunk/; revision=38053
11 lines
529 B
Diff
11 lines
529 B
Diff
--- glib-2.29.8/glib/gconvert.c.orig 2011-06-26 14:48:37.000000000 +0200
|
|
+++ glib-2.29.8/glib/gconvert.c 2011-06-26 14:49:58.000000000 +0200
|
|
@@ -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(__APPLE__) && defined(__LP64__)) && !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
|
|
#error GNU libiconv not in use but included iconv.h is from libiconv
|
|
#endif
|