[vlc-devel] commit: contribs: fixed issues when compiling glib for Darwin in 64bit mode ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Jul 18 02:22:26 2009 +0200| [0c82a51ebba9b1dd7975da5e3adfecd21161add2] | committer: Felix Paul Kühne 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0c82a51ebba9b1dd7975da5e3adfecd21161add2
---

 extras/contrib/src/Makefile                    |    3 +++
 extras/contrib/src/Patches/glib-Darwin64.patch |   12 ++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d220dcd..3e9b153 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1957,6 +1957,9 @@ glib-$(GLIB_VERSION).tar.bz2:
 glib: glib-$(GLIB_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 	(cd $@; patch -p0 < ../Patches/glib-remove-gtkdoc.patch)
+ifdef HAVE_DARWIN_10
+	(cd $@; patch -p0 < ../Patches/glib-Darwin64.patch)
+endif
 
 .glib: glib
 	(cd $<; sh autogen.sh --prefix=$(PREFIX) --host=$(HOST) && make && make install)
diff --git a/extras/contrib/src/Patches/glib-Darwin64.patch b/extras/contrib/src/Patches/glib-Darwin64.patch
new file mode 100644
index 0000000..aa3314e
--- /dev/null
+++ b/extras/contrib/src/Patches/glib-Darwin64.patch
@@ -0,0 +1,12 @@
+--- 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"
+