Merge branch 'master' into kernel-4.9

[people/pmueller/ipfire-2.x.git] / lfs / zlib

diff --git a/lfs/zlib b/lfs/zlib
index 1f47d652ee812e0ecbe8df26f12e721e5746dcaf..d0607513e8c2237f843d8d66795d8d91e3aff4a7 100644 (file)
--- 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-2017  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,24 @@
 
 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
+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 +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)