X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fzlib;h=0a2977d0d20d22ffc159bfa8e77f473a9eee9065;hp=1f47d652ee812e0ecbe8df26f12e721e5746dcaf;hb=91b20d84de68c80e230838e81a470c7bf5d3457b;hpb=f7b9315ef36af9405529c7d77c23c28a02d9169f

diff --git a/lfs/zlib b/lfs/zlib
index 1f47d652ee..0a2977d0d2 100644
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 1.2.3
+VER        = 1.2.7
 
 THISAPP    = zlib-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-CFLAGS    += -fPIC
+CFLAGS    += -fPIC -DPIC
 
 ###############################################################################
 # Top-level Rules
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE)                           = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                       = dee233bf288ee795ac96a98cc2e369b6
+$(DL_FILE)_MD5                       = 60df6a37c56e7c1366cca812414f7b85
 
 install : $(TARGET)
 
@@ -70,16 +70,16 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --shared --libdir=/lib
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr --shared
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	rm -v /lib/libz.so
-	ln -sfv ../../lib/libz.so.1.2.3 /usr/lib/libz.so
-	cd $(DIR_APP) && make clean
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
-	chmod -v 644 /usr/lib/libz.a
+
+	mv -v /usr/lib/libz.so.$(VER) /lib/libz.so.$(VER)
+	ln -svf libz.so.$(VER) /lib/libz.so.1
+	ln -svf libz.so.$(VER) /lib/libz.so
+	rm -vf /usr/lib/libz.so.1
+	rm -vf /usr/lib/libz.so
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)