X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fzlib;h=d742dad866d641484e6fc895a89bac7454c48dda;hp=9a72a410a19d19e853d760ba98c84195706d5e01;hb=af9aa1556e6329e7af3d8939c51316fe1599295a;hpb=9b0ff0a0b64dc82a593e08256c2f3a8a76695493

diff --git a/lfs/zlib b/lfs/zlib
index 9a72a410a1..d742dad866 100644
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,23 +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)
 
@@ -71,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
+	@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
-	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
+
+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)