From: Alexandros C. Couloumbis <alex@ozo.com>
Date: Sun, 19 Sep 2010 05:33:18 +0000 (+0000)
Subject: package/zlib: fix Darwin compile failure (closes #7963)
X-Git-Tag: reboot~18883
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aea8213bdd9dddea0448bf9206f2db513e0a64cd;p=openwrt%2Fstaging%2Fblogic.git

package/zlib: fix Darwin compile failure (closes #7963)

SVN-Revision: 23085
---

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 4eef6a1c9641..5cea85fc85e7 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -31,19 +31,18 @@ define Build/Configure
 		$(TARGET_CONFIGURE_OPTS) \
 		LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
 		CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
-		UNAME_S="Linux" \
 		./configure \
 			--prefix=/usr \
 			--shared \
+			--uname=Linux \
 	);
 endef
 
 define Build/Compile
 	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		LDSHARED="$(TARGET_CROSS)ld -shared" \
-		CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
-		libz.a
+		CFLAGS="$(TARGET_CFLAGS)" \
+		libz.a libz.so.$(PKG_VERSION)
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \