[vlc-devel] commit: contribs: fixed compilation on Snow Leopard, as Apple refuses to ship libiconv.la within /usr/lib any longer ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Aug 31 01:51:29 2009 +0200| [c6c8b86ed12ed0eee69032405df5c3b2af194fe2] | committer: Felix Paul Kühne 

contribs: fixed compilation on Snow Leopard, as Apple refuses to ship libiconv.la within /usr/lib any longer

'It is intended to not include the .la files in Mac OS X.  These are not required.'

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

 extras/contrib/src/Makefile     |   11 +++++++++++
 extras/contrib/src/packages.mak |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6198aaa..23580d4 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -408,10 +408,21 @@ ifdef HAVE_WIN64
 endif
 	patch -p0 < Patches/libiconv-autoconf-uclibc.patch
 
+libiconv-snowleopard.tar.bz2:
+	$(WGET) $(LIBICONVMAC_URL)
+
+libiconv-snowleopard: libiconv-snowleopard.tar.bz2
+	$(EXTRACT_BZ2)
 
 ifdef HAVE_DARWIN_OS
+ifdef HAVE_DARWIN_64
+.iconv: libiconv-snowleopard
+	(cd libiconv-snowleopard && cp libiconv.* ../../lib/)
+	touch $@
+else
 .iconv:
 	touch $@
+endif
 else
 .iconv: libiconv
 	(cd libiconv; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index ac27d6b..f49ab65 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -47,6 +47,7 @@ PKGCFG_URL=$(VIDEOLAN)/testing/contrib/pkg-config-$(PKGCFG_VERSION).tar.gz
 #PKGCFG_URL=http://pkgconfig.freedesktop.org/releases/pkg-config-$(PKGCFG_VERSION).tar.gz
 LIBICONV_VERSION=1.9.2
 LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
+LIBICONVMAC_URL=$(VIDEOLAN)/testing/contrib/libiconv-snowleopard.tar.bz2
 GETTEXT_VERSION=0.17
 GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
 FONTCONFIG_VERSION=2.7.0