X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fzlib;h=d742dad866d641484e6fc895a89bac7454c48dda;hp=1f47d652ee812e0ecbe8df26f12e721e5746dcaf;hb=d5b7f82a40b69a57d6d849c2e6da583c6772fc9a;hpb=9572596c47e961c6f4d970b4c4c72bd5f90920e0

diff --git a/lfs/zlib b/lfs/zlib
index 1f47d652ee..d742dad866 100644
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,24 +24,29 @@
 
 include Config
 
-VER        = 1.2.3
+VER        = 1.2.11
 
 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
+ifeq "$(TOOLCHAIN)" "1"
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)
+endif
+
+CFLAGS    += -fPIC -DPIC
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 objects = $(DL_FILE)
 
-$(DL_FILE)                           = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                       = dee233bf288ee795ac96a98cc2e369b6
+$(DL_FILE)_MD5 = 1c9f62f0778697a09d36121ead88e08e
 
 install : $(TARGET)
 
@@ -70,16 +75,18 @@ $(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
-	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
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --shared
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	chmod -v 644 /usr/lib/libz.a
+
+ifneq "$(TOOLCHAIN)" "1"
+	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
+endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)