From c51002994fbb50bf176fe2edbc3e0c49005ee242 Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Date: Mon, 9 Feb 2015 23:31:38 +0100
Subject: Toolchain: zlib_host: move its install to binutils Makefile

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
---
 core/toolchain/binutils/binutils.kconfig |  1 +
 core/toolchain/binutils/binutils.mk      | 16 +++++++++-------
 core/toolchain/common.mk                 |  1 -
 packages/htools/zlib/zlib.kconfig        |  1 -
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/toolchain/binutils/binutils.kconfig b/core/toolchain/binutils/binutils.kconfig
index ad12765..2cd065f 100644
--- a/core/toolchain/binutils/binutils.kconfig
+++ b/core/toolchain/binutils/binutils.kconfig
@@ -25,6 +25,7 @@
 
 config EMBTK_HAVE_BINUTILS
 	bool
+	select EMBTK_HOST_HAVE_ZLIB
 	default y
 
 choice
diff --git a/core/toolchain/binutils/binutils.mk b/core/toolchain/binutils/binutils.mk
index acaf1e7..33684b7 100644
--- a/core/toolchain/binutils/binutils.mk
+++ b/core/toolchain/binutils/binutils.mk
@@ -23,13 +23,15 @@
 # \date         May 2009
 ################################################################################
 
-BINUTILS_NAME		:= binutils
-BINUTILS_VERSION	:= $(call embtk_pkg_version,binutils)
-BINUTILS_SITE		:= http://ftp.gnu.org/gnu/binutils
-BINUTILS_GIT_SITE	:= git://sourceware.org/git/binutils.git
-BINUTILS_PACKAGE	:= binutils-$(BINUTILS_VERSION).tar.bz2
-BINUTILS_SRC_DIR	:= $(embtk_toolsb)/binutils-$(BINUTILS_VERSION)
-BINUTILS_BUILD_DIR	:= $(embtk_toolsb)/binutils-$(BINUTILS_VERSION)-build
+BINUTILS_NAME      := binutils
+BINUTILS_VERSION   := $(call embtk_pkg_version,binutils)
+BINUTILS_SITE      := http://ftp.gnu.org/gnu/binutils
+BINUTILS_GIT_SITE  := git://sourceware.org/git/binutils.git
+BINUTILS_PACKAGE   := binutils-$(BINUTILS_VERSION).tar.bz2
+BINUTILS_SRC_DIR   := $(embtk_toolsb)/binutils-$(BINUTILS_VERSION)
+BINUTILS_BUILD_DIR := $(embtk_toolsb)/binutils-$(BINUTILS_VERSION)-build
+
+BINUTILS_DEPS      := zlib_host_install
 
 BINUTILS_KEEP_SRC_DIR	:= $(embtk_toolchain_has_llvm-y)
 
diff --git a/core/toolchain/common.mk b/core/toolchain/common.mk
index 9ac9128..59a72e0 100644
--- a/core/toolchain/common.mk
+++ b/core/toolchain/common.mk
@@ -56,7 +56,6 @@ endif
 ifeq ($(embtk_buildhost_os),macos)
 EMBTK_TOOLCHAIN_PREDEPS-y += findutils_host_install
 endif
-EMBTK_TOOLCHAIN_PREDEPS-y += zlib_host_install
 
 #
 # Toolchain macros evaluating if core and addons need to be built
diff --git a/packages/htools/zlib/zlib.kconfig b/packages/htools/zlib/zlib.kconfig
index 3e00154..7fd2596 100644
--- a/packages/htools/zlib/zlib.kconfig
+++ b/packages/htools/zlib/zlib.kconfig
@@ -25,7 +25,6 @@
 
 config EMBTK_HOST_HAVE_ZLIB
 	bool
-	default y
 	help
 	 zlib is a compression library.
 
-- 
cgit v1.2.3