[vlc-commits] contrib: zlib: fix OSX build

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Apr 30 23:42:47 2012 -0400| [5eae352da8ce3068f3d47c34e8011726f6021e4a] | committer: Rafaël Carré

contrib: zlib: fix OSX build

OSX libtool (in /usr/bin) is not the same thing than GNU libtool
No need to run RECONF since configure is not a GNU autoconf script

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

 contrib/src/zlib/rules.mak      |    2 +-
 contrib/src/zlib/zlib-osx.patch |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/contrib/src/zlib/rules.mak b/contrib/src/zlib/rules.mak
index d96edaf..210da1e 100644
--- a/contrib/src/zlib/rules.mak
+++ b/contrib/src/zlib/rules.mak
@@ -15,10 +15,10 @@ $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
 zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
 	$(UNPACK)
 	$(APPLY) $(SRC)/zlib/zlib-wince.patch
+	$(APPLY) $(SRC)/zlib/zlib-osx.patch
 	$(MOVE)
 
 .zlib: zlib
-	#$(RECONF)
 	cd $< && $(HOSTVARS) ./configure --prefix=$(PREFIX) --static
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/zlib/zlib-osx.patch b/contrib/src/zlib/zlib-osx.patch
new file mode 100644
index 0000000..9097f22
--- /dev/null
+++ b/contrib/src/zlib/zlib-osx.patch
@@ -0,0 +1,12 @@
+diff -ru zlib.orig/configure zlib/configure
+--- zlib.orig/configure	2012-04-30 23:41:03.155668067 -0400
++++ zlib/configure	2012-04-30 23:41:13.787667975 -0400
+@@ -206,7 +206,7 @@
+              SHAREDLIBV=libz.$VER$shared_ext
+              SHAREDLIBM=libz.$VER1$shared_ext
+              LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
+-             AR="libtool"
++             AR="/usr/bin/libtool"
+              ARFLAGS="-o" ;;
+   *)             LDSHARED=${LDSHARED-"$cc -shared"} ;;
+   esac