Packages: zlib: update to zlib-1.2.5

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>

2 files changed, 63 insertions, 21 deletions

diff --git a/mk/packages.mk b/mk/packages.mk
index d539e60..f9d34bd 100644
--- a/mk/packages.mk
+++ b/mk/packages.mk
@@ -57,6 +57,7 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_MTDUTILS) += mtd-utils_target_insta
 ROOTFS_COMPONENTS_CLEAN += mtd-utils_target_clean
 
 #Compression packages
+ROOTFS_COMPONENTS_CLEAN += zlib_target_clean
 
 # Graphics packages
 include $(EMBTK_ROOT)/packages/graphics/graphics.mk
diff --git a/mk/zlib.mk b/mk/zlib.mk
index a317d44..605bf46 100644
--- a/mk/zlib.mk
+++ b/mk/zlib.mk
@@ -22,52 +22,93 @@
 # \date         June 2009
 ################################################################################
 
-ZLIB_VERSION := 1.2.3
+ZLIB_VERSION := 1.2.5
 ZLIB_SITE := http://www.gzip.org/zlib
 ZLIB_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/zlib/patches
 ZLIB_PACKAGE := zlib-$(ZLIB_VERSION).tar.bz2
-ZLIB_HOST_BUILD_DIR := $(TOOLS_BUILD)/zlib-host-build
-ZLIB_TARGET_BUILD_DIR := $(PACKAGES_BUILD)/zlib-target-build
+ZLIB_HOST_BUILD_DIR := $(TOOLS_BUILD)/zlib-$(ZLIB_VERSION)
+ZLIB_TARGET_BUILD_DIR := $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION)
 
 zlib_host_install: $(ZLIB_HOST_BUILD_DIR)/.installed
+
+ZLIB_TARGET_BINS =
+ZLIB_TARGET_SBINS =
+ZLIB_TARGET_INCLUDES = zconf.h zlib.h
+ZLIB_TARGET_LIBS = libz.*
+ZLIB_TARGET_PKGCONFIGS = zlib.pc
+
+ifeq ($(CONFIG_EMBTK_64BITS_FS),y)
+ZLIB_TARGET_LINUX_ARCH := --64
+endif
 zlib_target_install: $(ZLIB_TARGET_BUILD_DIR)/.installed
 
 #zlib on host machine
 $(ZLIB_HOST_BUILD_DIR)/.installed: download_zlib \
-	$(ZLIB_HOST_BUILD_DIR)/.decompressed
-	@$(MAKE) -C $(TOOLS_BUILD)/zlib-$(ZLIB_VERSION)-host $(J)
-	@$(MAKE) -C $(TOOLS_BUILD)/zlib-$(ZLIB_VERSION)-host \
-	prefix=$(HOSTTOOLS)/usr/local install
+	$(ZLIB_HOST_BUILD_DIR)/.decompressed $(ZLIB_HOST_BUILD_DIR)/.configured
+	@$(MAKE) -C $(ZLIB_HOST_BUILD_DIR)
+	@$(MAKE) -C $(ZLIB_HOST_BUILD_DIR) install
 	@touch $@
 
 $(ZLIB_HOST_BUILD_DIR)/.decompressed:
 	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(ZLIB_PACKAGE)...")
 	@tar -C $(TOOLS_BUILD) -xjf $(DOWNLOAD_DIR)/$(ZLIB_PACKAGE)
-	@mv  $(TOOLS_BUILD)/zlib-$(ZLIB_VERSION) \
-	$(TOOLS_BUILD)/zlib-$(ZLIB_VERSION)-host
-	@mkdir -p $(ZLIB_HOST_BUILD_DIR)
+	@touch $@
+
+$(ZLIB_HOST_BUILD_DIR)/.configured:
+	$(call EMBTK_GENERIC_MESSAGE,"Configuring \
+	zlib-$(ZLIB_VERSION) for your development machine...")
+	@cd $(ZLIB_HOST_BUILD_DIR); \
+	./configure --prefix=$(HOSTTOOLS)/usr
 	@touch $@
 
 #zlib on target machine
 $(ZLIB_TARGET_BUILD_DIR)/.installed: download_zlib \
-$(ZLIB_TARGET_BUILD_DIR)/.decompressed
-	@$(MAKE) -C $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION)-target \
-	CC=$(TARGETCC_CACHED) AR="$(TOOLS)/bin/$(GNU_TARGET)-ar rc" \
-	RANLIB=$(TOOLS)/bin/$(GNU_TARGET)-ranlib CFLAGS=-fPIC
-	@$(MAKE) -C $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION)-target \
-	CC=$(TARGETCC_CACHED) AR="$(TOOLS)/bin/$(GNU_TARGET)-ar rc" \
-	RANLIB=$(TOOLS)/bin/$(GNU_TARGET)-ranlib \
-	prefix=$(SYSROOT)/usr/ libdir=$(SYSROOT)/usr/$(LIBDIR) install
+	$(ZLIB_TARGET_BUILD_DIR)/.decompressed \
+	$(ZLIB_TARGET_BUILD_DIR)/.configured
+	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
+	zlib-$(ZLIB_VERSION) in your root filesystem...")
+	$(Q)$(MAKE) -C $(ZLIB_TARGET_BUILD_DIR)
+	$(Q)$(MAKE) -C $(ZLIB_TARGET_BUILD_DIR) DESTDIR=$(SYSROOT) install
+	$(Q)$(MAKE) libtool_files_adapt
+	$(Q)$(MAKE) pkgconfig_files_adapt
 	@touch $@
 
 $(ZLIB_TARGET_BUILD_DIR)/.decompressed:
 	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(ZLIB_PACKAGE)...")
 	@tar -C $(PACKAGES_BUILD) -xjf $(DOWNLOAD_DIR)/$(ZLIB_PACKAGE)
-	@mv  $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION) \
-	$(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION)-target
-	@mkdir -p $(ZLIB_TARGET_BUILD_DIR)
 	@touch $@
 
+$(ZLIB_TARGET_BUILD_DIR)/.configured:
+	$(Q)cd $(ZLIB_TARGET_BUILD_DIR); \
+	CC=$(TARGETCC_CACHED) \
+	CXX=$(TARGETCXX_CACHED) \
+	AR=$(TARGETAR) \
+	RANLIB=$(TARGETRANLIB) \
+	AS=$(CROSS_COMPILE)as \
+	LD=$(TARGETLD) \
+	NM=$(TARGETNM) \
+	STRIP=$(TARGETSTRIP) \
+	OBJDUMP=$(TARGETOBJDUMP) \
+	OBJCOPY=$(TARGETOBJCOPY) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CXXFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
+	CPPFLGAS="-I$(SYSROOT)/usr/include" \
+	PKG_CONFIG=$(PKGCONFIG_BIN) \
+	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+	./configure $(ZLIB_TARGET_LINUX_ARCH) \
+	--libdir=/usr/$(LIBDIR) --prefix=/usr
+	@touch $@
+
+zlib_target_clean:
+	$(call EMBTK_GENERIC_MESSAGE,"cleanup zlib-$(ZLIB_VERSION)...")
+	$(Q)-cd $(SYSROOT)/usr/bin; rm -rf $(ZLIB_TARGET_BINS)
+	$(Q)-cd $(SYSROOT)/usr/sbin; rm -rf $(ZLIB_TARGET_SBINS)
+	$(Q)-cd $(SYSROOT)/usr/include; rm -rf $(ZLIB_TARGET_INCLUDES)
+	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR); rm -rf $(ZLIB_TARGET_LIBS)
+	$(Q)-cd $(SYSROOT)/usr/$(LIBDIR)/pkgconfig; rm -rf $(ZLIB_TARGET_PKGCONFIGS)
+
+
 #zlib download
 download_zlib:
 	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(ZLIB_PACKAGE) if necessary...")