From 95b66e8465265b8cacc49a93e216d53a87b81733 Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Date: Sun, 8 Feb 2015 19:52:07 +0100
Subject: Packages/Hosttools: zlib: update to v1.2.8

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
---
 packages/compression/zlib/zlib.kconfig | 14 ++++++--------
 packages/compression/zlib/zlib.mk      |  5 ++---
 packages/htools/zlib/zlib.kconfig      |  8 +++-----
 packages/htools/zlib/zlib.mk           | 10 ++++++----
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/packages/compression/zlib/zlib.kconfig b/packages/compression/zlib/zlib.kconfig
index 31ccd13..ac209b7 100644
--- a/packages/compression/zlib/zlib.kconfig
+++ b/packages/compression/zlib/zlib.kconfig
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2010-2012 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2015 Abdoulaye Walsimou GAYE.
 #
 # 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
@@ -26,23 +26,21 @@
 config EMBTK_HAVE_ZLIB
 	bool "Have zlib in target"
 	help
-		zlib is a compression library.
+	 zlib is a compression library.
 
 choice
 	prompt "zlib version to use"
 	depends on EMBTK_HAVE_ZLIB
 	help
-		zlib version to use
+	 zlib version to use
 
-	config EMBTK_ZLIB_VERSION_1_2_7
-		bool "zlib-1.2.7"
+	config EMBTK_ZLIB_VERSION_1_2_8
+		bool "zlib-1.2.8"
 endchoice
 
 config EMBTK_ZLIB_VERSION_STRING
 	string
-	default "1.2.7"		if EMBTK_ZLIB_VERSION_1_2_7
+	default "1.2.8"		if EMBTK_ZLIB_VERSION_1_2_8
 
 config EMBTK_ZLIB_NEED_PATCH
 	bool
-config EMBTK_ZLIB_NEED_AUTORECONF
-	bool
diff --git a/packages/compression/zlib/zlib.mk b/packages/compression/zlib/zlib.mk
index 905a45a..77034d5 100644
--- a/packages/compression/zlib/zlib.mk
+++ b/packages/compression/zlib/zlib.mk
@@ -25,9 +25,8 @@
 
 ZLIB_NAME		:= zlib
 ZLIB_VERSION		:= $(call embtk_get_pkgversion,zlib)
-ZLIB_SITE		:= http://zlib.net
-ZLIB_MIRROR1		:= http://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_VERSION)
-ZLIB_PACKAGE		:= zlib-$(ZLIB_VERSION).tar.bz2
+ZLIB_SITE		:= http://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_VERSION)
+ZLIB_PACKAGE		:= zlib-$(ZLIB_VERSION).tar.xz
 ZLIB_SRC_DIR		:= $(embtk_pkgb)/zlib-$(ZLIB_VERSION)
 ZLIB_BUILD_DIR		:= $(embtk_pkgb)/zlib-$(ZLIB_VERSION)
 
diff --git a/packages/htools/zlib/zlib.kconfig b/packages/htools/zlib/zlib.kconfig
index 75a73e9..7fd2596 100644
--- a/packages/htools/zlib/zlib.kconfig
+++ b/packages/htools/zlib/zlib.kconfig
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2010-2012 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2015 Abdoulaye Walsimou GAYE.
 #
 # 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
@@ -26,13 +26,11 @@
 config EMBTK_HOST_HAVE_ZLIB
 	bool
 	help
-		zlib is a compression library.
+	 zlib is a compression library.
 
 config EMBTK_ZLIB_HOST_VERSION_STRING
 	string
-	default "1.2.5"
+	default "1.2.8"
 
 config EMBTK_ZLIB_HOST_NEED_PATCH
 	bool
-config EMBTK_ZLIB_HOST_NEED_AUTORECONF
-	bool
diff --git a/packages/htools/zlib/zlib.mk b/packages/htools/zlib/zlib.mk
index b7eaa29..6198538 100644
--- a/packages/htools/zlib/zlib.mk
+++ b/packages/htools/zlib/zlib.mk
@@ -24,13 +24,15 @@
 ################################################################################
 
 ZLIB_HOST_NAME		:= zlib
-ZLIB_HOST_VERSION	:= $(call embtk_get_pkgversion,zlib_host)
-ZLIB_HOST_SITE		:= http://zlib.net
-ZLIB_HOST_PACKAGE	:= zlib-$(ZLIB_HOST_VERSION).tar.bz2
+ZLIB_HOST_VERSION	:= $(call embtk_pkg_version,zlib_host)
+ZLIB_HOST_SITE		:= http://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_HOST_VERSION)
+ZLIB_HOST_PACKAGE	:= zlib-$(ZLIB_HOST_VERSION).tar.xz
 ZLIB_HOST_SRC_DIR	:= $(embtk_toolsb)/zlib-$(ZLIB_HOST_VERSION)
 ZLIB_HOST_BUILD_DIR	:= $(embtk_toolsb)/zlib-$(ZLIB_HOST_VERSION)
 
-ZLIB_HOST_CONFIGURE_ENV		:= CC=$(HOSTCC_CACHED)
+ZLIB_HOST_CONFIGURE_ENV  := CC=$(HOSTCC_CACHED)
+ZLIB_HOST_CONFIGURE_OPTS := --static
+ZLIB_HOST_MAKE_OPTS      := ARFLAGS="rcvs"
 
 define embtk_install_zlib_host
 	$(call embtk_makeinstall_hostpkg,zlib_host)
-- 
cgit v1.2.3