contribs: fixed compilation on Snow Leopard, as Apple refuses to ship libiconv.la...

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

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6198aaa5e16b9e48f0218b95203739b12fbe5920..23580d4f751335c75a0304979d7ef4afbe2b5b8e 100644 (file)
--- 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 ac27d6bcf5f64411c9e2d87eca872bf55be6190a..f49ab652b37cd39ca50da594cebf8c69c2aa6e26 100644 (file)
--- 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