Commit 0c82a51e authored by Felix Paul Kühne's avatar Felix Paul Kühne

contribs: fixed issues when compiling glib for Darwin in 64bit mode

parent 10507f67
...@@ -1957,6 +1957,9 @@ glib-$(GLIB_VERSION).tar.bz2: ...@@ -1957,6 +1957,9 @@ glib-$(GLIB_VERSION).tar.bz2:
glib: glib-$(GLIB_VERSION).tar.bz2 glib: glib-$(GLIB_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
(cd $@; patch -p0 < ../Patches/glib-remove-gtkdoc.patch) (cd $@; patch -p0 < ../Patches/glib-remove-gtkdoc.patch)
ifdef HAVE_DARWIN_10
(cd $@; patch -p0 < ../Patches/glib-Darwin64.patch)
endif
.glib: glib .glib: glib
(cd $<; sh autogen.sh --prefix=$(PREFIX) --host=$(HOST) && make && make install) (cd $<; sh autogen.sh --prefix=$(PREFIX) --host=$(HOST) && make && make install)
......
--- glib/gconvert.c 2009-06-27 05:18:06.000000000 +0200
+++ glib/gconvert.c 2009-07-18 02:09:30.000000000 +0200
@@ -51,9 +51,6 @@
#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"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment