X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fzlib%2FMakefile;h=d8213b972dc83fe6ce2cd6afc7df84c2030a844c;hb=168a398b9bb18e73811becc4ce4e193b0de77ca8;hp=293462528f1fc3097757bec37ea509ebc34c73b9;hpb=640652a244c6916ea5c2a886c52d477d5742e0d8;p=openwrt-10.03%2F.git

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 293462528..d8213b972 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -4,13 +4,12 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
 PKG_VERSION:=1.2.3
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
@@ -29,7 +28,7 @@ define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
 		$(TARGET_CONFIGURE_OPTS) \
 		LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
-		CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+		CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
 		UNAME_S="Linux" \
 		./configure \
 			--prefix=/usr \
@@ -40,7 +39,8 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+		LDSHARED="$(TARGET_CROSS)ld -shared" \
+		CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
 		libz.a libz.so
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -56,11 +56,6 @@ define Build/InstallDev
 	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
 		$(1)/usr/lib/
 endef
-	
-define Build/UninstallDev
-	rm -rf	$(1)/usr/include/z{conf,lib}.h \
-		$(1)/usr/lib/libz.{a,so*}
-endef
 
 # libz.so is needed for openssl (zlib-dynamic)
 define Package/zlib/install