update target zlib

diff --git a/make/archives.mk b/make/archives.mk
index 00463e1cda5120e39456a7ce173ad1a8a7a659f0..b39cc921839ed03eb6c4f9a3429de3b274e73616 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -3,8 +3,8 @@
 $(ARCHIVE)/autofs-4.1.4.tar.bz2:
        $(WGET) http://www.fhloston-paradise.de/autofs-4.1.4.tar.bz2
 
-$(ARCHIVE)/zlib-1.2.8.tar.gz:
-       $(WGET) http://www.fhloston-paradise.de/zlib-1.2.8.tar.gz
+$(ARCHIVE)/zlib-$(ZLIB_VER).tar.bz2:
+       $(WGET) http://downloads.sourceforge.net/project/libpng/zlib/$(ZLIB_VER)/zlib-$(ZLIB_VER).tar.bz2
 
 $(ARCHIVE)/libmad-0.15.1b.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/libmad-0.15.1b.tar.gz

diff --git a/make/libraries.mk b/make/libraries.mk
index 0620ce38f0a1ea57ba8efa26c53ee208efd4e209..d43f12202d9e8217fefb7f244e2c3690aac6dea8 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -84,17 +84,16 @@ $(D)/libid3tag: $(D)/zlib $(ARCHIVE)/libid3tag-0.15.1b.tar.gz | $(TARGETPREFIX)
        $(REMOVE)/libid3tag-0.15.1b
        touch $@
 
-$(D)/zlib: $(ARCHIVE)/zlib-1.2.8.tar.gz | $(TARGETPREFIX)
-       $(UNTAR)/zlib-1.2.8.tar.gz
-       cd $(BUILD_TMP)/zlib-1.2.8 && \
-               sed -i 's/ifdef _LARGEFILE64_SOURCE/ifndef _LARGEFILE64_SOURCE/' zlib.h && \
-               sed -i 's/-_LARGEFILE64_SOURCE -/defined(_LARGEFILE64_SOURCE) \&\& -_LARGEFILE64_SOURCE -/' zconf.h.in && \
-               CC=$(TARGET)-gcc mandir=$(BUILD_TMP)/.remove ./configure --prefix= --shared && \
-               $(MAKE) && \
-               ln -sf /bin/true ldconfig && \
-               PATH=$(BUILD_TMP)/zlib-1.2.8:$(PATH) $(MAKE) install prefix=$(TARGETPREFIX)
+$(D)/zlib: $(ARCHIVE)/zlib-$(ZLIB_VER).tar.xz | $(TARGETPREFIX)
+       $(UNTAR)/zlib-$(ZLIB_VER).tar.xz
+       set -e; cd $(BUILD_TMP)/zlib-$(ZLIB_VER); \
+               CC=$(TARGET)-gcc mandir=$(BUILD_TMP)/.remove ./configure --prefix= --shared; \
+               $(MAKE); \
+               ln -sf /bin/true ldconfig; \
+               rm -f $(TARGETPREFIX)/lib/libz.so*; \
+               PATH=$(BUILD_TMP)/zlib-$(ZLIB_VER):$(PATH) make install prefix=$(TARGETPREFIX)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/zlib.pc
-       $(REMOVE)/zlib-1.2.8
+       $(REMOVE)/zlib-$(ZLIB_VER)
        $(REMOVE)/.remove
        touch $@
 

diff --git a/make/versions.mk b/make/versions.mk
index 49ac9140404d82631330252161be5849394ea774..dba612e8c7b6adeae9615bf7b0bba21a123e8e29 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -129,3 +129,6 @@ USHARE_VER = 1.1a
 # Very secure ftp-Server
 VSFTPD_VER = 3.0.3
 
+# zlib; compression an decompressin library
+ZLIB_VER=1.2.8
+