Commit 5eae352d authored by Rafaël Carré's avatar 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
parent 1f3009e7
...@@ -15,10 +15,10 @@ $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz: ...@@ -15,10 +15,10 @@ $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/zlib/zlib-wince.patch $(APPLY) $(SRC)/zlib/zlib-wince.patch
$(APPLY) $(SRC)/zlib/zlib-osx.patch
$(MOVE) $(MOVE)
.zlib: zlib .zlib: zlib
#$(RECONF)
cd $< && $(HOSTVARS) ./configure --prefix=$(PREFIX) --static cd $< && $(HOSTVARS) ./configure --prefix=$(PREFIX) --static
cd $< && $(MAKE) install cd $< && $(MAKE) install
touch $@ touch $@
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
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