From dec7ba98333dcf69a97ea8a22583171fbe035e00 Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 15 Jan 2012 12:24:31 +0100 Subject: Packages: zlib: separate zlib and zlib_host to avoid unmet dependency EMBTK_HAVE_ROOTFS Signed-off-by: Abdoulaye Walsimou Gaye --- packages/compression/compression.mk | 4 +- packages/compression/zlib/zlib.kconfig | 27 ++----------- packages/compression/zlib/zlib.mk | 74 ++++------------------------------ 3 files changed, 13 insertions(+), 92 deletions(-) (limited to 'packages/compression') diff --git a/packages/compression/compression.mk b/packages/compression/compression.mk index 4da50c3..3396717 100644 --- a/packages/compression/compression.mk +++ b/packages/compression/compression.mk @@ -28,8 +28,6 @@ include $(EMBTK_ROOT)/packages/compression/lzo/lzo.mk ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LZO) += lzo_install HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_LZO) += lzo_host_install -#zlib for host and target +#zlib for target include $(EMBTK_ROOT)/packages/compression/zlib/zlib.mk ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_ZLIB) += zlib_install -HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_ZLIB) += zlib_host_install - diff --git a/packages/compression/zlib/zlib.kconfig b/packages/compression/zlib/zlib.kconfig index b4e967f..2163b45 100644 --- a/packages/compression/zlib/zlib.kconfig +++ b/packages/compression/zlib/zlib.kconfig @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2010-2011 Abdoulaye Walsimou GAYE. +# Copyright(C) 2010-2012 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 @@ -28,15 +28,11 @@ config EMBTK_HAVE_ZLIB help zlib is a compression library. -config EMBTK_HOST_HAVE_ZLIB - bool - help - build zlib for the host development machine. choice - prompt "zlib version used" - depends on EMBTK_HAVE_ZLIB || EMBTK_HOST_HAVE_ZLIB + prompt "zlib version to use" + depends on EMBTK_HAVE_ZLIB help - zlib version used + zlib version to use config EMBTK_ZLIB_VERSION_1_2_5 bool "zlib-1.2.5" @@ -48,20 +44,5 @@ config EMBTK_ZLIB_VERSION_STRING config EMBTK_ZLIB_NEED_PATCH bool - select EMBTK_ZLIB_HOST_NEED_PATCH config EMBTK_ZLIB_NEED_AUTORECONF bool - select EMBTK_ZLIB_HOST_NEED_AUTORECONF -config EMBTK_ZLIB_PKG_IS_TARGZ - bool -config EMBTK_ZLIB_PKG_IS_TARBZ2 - bool - -config EMBTK_ZLIB_HOST_NEED_PATCH - bool -config EMBTK_ZLIB_HOST_NEED_AUTORECONF - bool -config EMBTK_ZLIB_HOST_PKG_IS_TARGZ - bool -config EMBTK_ZLIB_HOST_PKG_IS_TARBZ2 - bool diff --git a/packages/compression/zlib/zlib.mk b/packages/compression/zlib/zlib.mk index cd6e6d7..0a982d2 100644 --- a/packages/compression/zlib/zlib.mk +++ b/packages/compression/zlib/zlib.mk @@ -1,6 +1,6 @@ ################################################################################ # Embtoolkit -# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE. +# Copyright(C) 2009-2012 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,24 +26,20 @@ ZLIB_NAME := zlib ZLIB_VERSION := $(call embtk_get_pkgversion,zlib) ZLIB_SITE := http://zlib.net -ZLIB_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror ZLIB_PACKAGE := zlib-$(ZLIB_VERSION).tar.bz2 ZLIB_SRC_DIR := $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION) ZLIB_BUILD_DIR := $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION) -########################## -# zlib on target machine # -########################## -ZLIB_BINS = -ZLIB_SBINS = -ZLIB_INCLUDES = zconf.h zlib.h -ZLIB_LIBS = libz.* -ZLIB_PKGCONFIGS = zlib.pc + +ZLIB_BINS := +ZLIB_SBINS := +ZLIB_INCLUDES := zconf.h zlib.h +ZLIB_LIBS := libz.* +ZLIB_PKGCONFIGS := zlib.pc ZLIB_CONFIGURE_ENV := ZLIB_CONFIGURE_OPTS := --enable-shared - zlib_install: $(Q)test -e $(ZLIB_BUILD_DIR)/.installed || \ $(MAKE) $(ZLIB_BUILD_DIR)/.installed @@ -51,6 +47,7 @@ zlib_install: $(ZLIB_BUILD_DIR)/.installed: download_zlib \ $(ZLIB_SRC_DIR)/.decompressed \ $(ZLIB_BUILD_DIR)/.configured + $(call embtk_pinfo,"Compile/Install $(ZLIB_PACKAGE) for target") $(Q)$(MAKE) -C $(ZLIB_BUILD_DIR) $(J) $(Q)$(MAKE) -C $(ZLIB_BUILD_DIR) DESTDIR=$(SYSROOT) install $(Q)touch $@ @@ -59,8 +56,6 @@ $(ZLIB_SRC_DIR)/.decompressed: $(call embtk_decompress_pkg,zlib) $(ZLIB_BUILD_DIR)/.configured: - $(call embtk_pinfo,"Configure $(ZLIB_PACKAGE)...") - $(call EMBTK_PRINT_CONFIGURE_OPTS,"$(ZLIB_CONFIGURE_OPTS)") $(Q)cd $(ZLIB_BUILD_DIR); \ CC=$(TARGETCC_CACHED) \ CXX=$(TARGETCXX_CACHED) \ @@ -83,56 +78,3 @@ $(ZLIB_BUILD_DIR)/.configured: --libdir=/usr/$(LIBDIR) --prefix=/usr --sysconfdir=/etc \ $(ZLIB_CONFIGURE_OPTS) @touch $@ - -zlib_clean: - $(call embtk_cleanup_pkg,zlib) - -######################## -# zlib on host machine # -######################## -ZLIB_HOST_NAME := $(ZLIB_NAME) -ZLIB_HOST_VERSION := $(ZLIB_VERSION) -ZLIB_HOST_SITE := $(ZLIB_SITE) -ZLIB_HOST_SITE_MIRROR1 := $(ZLIB_SITE_MIRROR1) -ZLIB_HOST_SITE_MIRROR2 := $(ZLIB_SITE_MIRROR2) -ZLIB_HOST_SITE_MIRROR3 := $(ZLIB_SITE_MIRROR3) -ZLIB_HOST_PACKAGE := $(ZLIB_PACKAGE) -ZLIB_HOST_SRC_DIR := $(TOOLS_BUILD)/zlib-$(ZLIB_VERSION) -ZLIB_HOST_BUILD_DIR := $(TOOLS_BUILD)/zlib-$(ZLIB_VERSION) - -ZLIB_HOST_CONFIGURE_ENV := CC=$(HOSTCC_CACHED) - -zlib_host_install: - $(Q)test -e $(ZLIB_HOST_BUILD_DIR)/.installed || \ - $(MAKE) $(ZLIB_HOST_BUILD_DIR)/.installed - -$(ZLIB_HOST_BUILD_DIR)/.installed: download_zlib \ - $(ZLIB_HOST_SRC_DIR)/.decompressed \ - $(ZLIB_HOST_BUILD_DIR)/.configured - $(Q)$(MAKE) -C $(ZLIB_HOST_BUILD_DIR) $(J) - $(Q)$(MAKE) -C $(ZLIB_HOST_BUILD_DIR) install - $(Q)touch $@ - -$(ZLIB_HOST_SRC_DIR)/.decompressed: - $(call embtk_decompress_pkg,zlib_host) - -$(ZLIB_HOST_BUILD_DIR)/.configured: - $(call embtk_pinfo,"Configure $(ZLIB_HOST_PACKAGE) for host...") - $(call EMBTK_PRINT_CONFIGURE_OPTS,"$(ZLIB_HOST_CONFIGURE_OPTS)") - $(Q)cd $(ZLIB_HOST_BUILD_DIR); \ - CPPFLAGS="-I$(HOSTTOOLS)/usr/include" \ - LDFLAGS="-L$(HOSTTOOLS)/$(LIBDIR) -L$(HOSTTOOLS)/usr/$(LIBDIR)" \ - $(ZLIB_HOST_CONFIGURE_ENV) \ - $(CONFIG_SHELL) $(ZLIB_HOST_SRC_DIR)/configure \ - --prefix=$(HOSTTOOLS)/usr $(ZLIB_HOST_CONFIGURE_OPTS) - $(Q)touch $@ - -zlib_host_clean: - -########## -# Common # -########## - -#zlib download -download_zlib download_zlib_host: - $(call embtk_download_pkg,zlib) -- cgit v1.2.3