Packages: zlib: convert to partially use generic macros

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

7 files changed, 121 insertions, 101 deletions

diff --git a/packages/compression/compression.mk b/packages/compression/compression.mk
index 92f9811..4da50c3 100644
--- a/packages/compression/compression.mk
+++ b/packages/compression/compression.mk
@@ -30,6 +30,6 @@ HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_LZO) += lzo_host_install
 
 #zlib for host and target
 include $(EMBTK_ROOT)/packages/compression/zlib/zlib.mk
-ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_ZLIB) += zlib_target_install
+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 ce1a96e..a8b6f89 100644
--- a/packages/compression/zlib/zlib.kconfig
+++ b/packages/compression/zlib/zlib.kconfig
@@ -25,6 +25,7 @@
 
 config EMBTK_HAVE_ZLIB
 	bool "Have zlib in target"
+	select EMBTK_ZLIB_PKG_IS_TARBZ2
 	help
 		zlib is a compression library.
 
@@ -42,9 +43,28 @@ choice
 		bool "zlib-1.2.5"
 endchoice
 
-config EMBTK_ZLIB_NEED_PATCH
-	bool
-
 config EMBTK_ZLIB_VERSION_STRING
 	string
 	default "1.2.5"		if EMBTK_ZLIB_VERSION_1_2_5
+
+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
+	select EMBTK_ZLIB_HOST_PKG_IS_TARGZ
+config EMBTK_ZLIB_PKG_IS_TARBZ2
+	bool
+	select EMBTK_ZLIB_HOST_PKG_IS_TARBZ2
+
+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 21a83ca..d1448bc 100644
--- a/packages/compression/zlib/zlib.mk
+++ b/packages/compression/zlib/zlib.mk
@@ -23,118 +23,118 @@
 # \date         June 2009
 ################################################################################
 
-ZLIB_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_ZLIB_VERSION_STRING)))
-ZLIB_SITE := http://zlib.net
-ZLIB_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/zlib/$(ZLIB_VERSION)
-ZLIB_PACKAGE := zlib-$(ZLIB_VERSION).tar.bz2
-ZLIB_HOST_BUILD_DIR := $(TOOLS_BUILD)/zlib-$(ZLIB_VERSION)
-ZLIB_TARGET_BUILD_DIR := $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION)
+ZLIB_NAME		:= zlib
+ZLIB_VERSION		:= $(call EMBTK_GET_PKG_VERSION,ZLIB)
+ZLIB_SITE		:= http://zlib.net
+ZLIB_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+ZLIB_PATCH_SITE		:= ftp://ftp.embtoolkit.org/embtoolkit.org/zlib/$(ZLIB_VERSION)
+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_LINUX_ARCH		:= $(if $(CONFIG_EMBTK_64BITS_FS),--64,)
+
+ZLIB_CONFIGURE_ENV	:=
+ZLIB_CONFIGURE_OPTS	:= $(ZLIB_LINUX_ARCH) --enable-shared
+
+
+zlib_install:
+	@test -e $(ZLIB_BUILD_DIR)/.installed || \
+	$(MAKE) $(ZLIB_BUILD_DIR)/.installed
+
+$(ZLIB_BUILD_DIR)/.installed: download_zlib \
+	$(ZLIB_SRC_DIR)/.decompressed \
+	$(ZLIB_BUILD_DIR)/.configured
+	$(Q)$(MAKE) -C $(ZLIB_BUILD_DIR) $(J)
+	$(Q)$(MAKE) -C $(ZLIB_BUILD_DIR) DESTDIR=$(SYSROOT) install
+	@touch $@
+
+$(ZLIB_SRC_DIR)/.decompressed:
+	$(call EMBTK_DECOMPRESS_PKG,ZLIB)
+
+$(ZLIB_BUILD_DIR)/.configured:
+	$(call EMBTK_GENERIC_MSG,"Configure $(ZLIB_PACKAGE)...")
+	$(call EMBTK_PRINT_CONFIGURE_OPTS,"$(ZLIB_CONFIGURE_OPTS)")
+	@cd $(ZLIB_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)"	\
+	CPPFLAGS="-I$(SYSROOT)/usr/include"				\
+	PKG_CONFIG=$(PKGCONFIG_BIN)					\
+	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)				\
+	$(ZLIB_CONFIGURE_ENV)						\
+	$(CONFIG_SHELL) $(ZLIB_SRC_DIR)/configure			\
+	--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_PATCH_SITE	:= $(ZLIB_PATCH_SITE)
+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_install:
 	@test -e $(ZLIB_HOST_BUILD_DIR)/.installed || \
 	$(MAKE) $(ZLIB_HOST_BUILD_DIR)/.installed
 
 $(ZLIB_HOST_BUILD_DIR)/.installed: download_zlib \
-	$(ZLIB_HOST_BUILD_DIR)/.decompressed $(ZLIB_HOST_BUILD_DIR)/.configured
-	@$(MAKE) -C $(ZLIB_HOST_BUILD_DIR)
-	@$(MAKE) -C $(ZLIB_HOST_BUILD_DIR) install
+	$(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
 	@touch $@
 
-$(ZLIB_HOST_BUILD_DIR)/.decompressed:
-	$(call EMBTK_GENERIC_MESSAGE,"Decompressing $(ZLIB_PACKAGE)...")
-	@tar -C $(TOOLS_BUILD) -xjf $(DOWNLOAD_DIR)/$(ZLIB_PACKAGE)
-	@touch $@
+$(ZLIB_HOST_SRC_DIR)/.decompressed:
+	$(call EMBTK_DECOMPRESS_PKG,ZLIB)
 
 $(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
+	$(call EMBTK_GENERIC_MSG,"Configure $(ZLIB_HOST_PACKAGE) for host...")
+	$(call EMBTK_PRINT_CONFIGURE_OPTS,"$(ZLIB_HOST_CONFIGURE_OPTS)")
+	@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_SRC_DIR)/configure			\
+	--prefix=$(HOSTTOOLS)/usr $(ZLIB_HOST_CONFIGURE_OPTS)
 	@touch $@
 
 zlib_host_clean:
 
-##########################
-# zlib on target machine #
-##########################
-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:
-	@test -e $(ZLIB_TARGET_BUILD_DIR)/.installed || \
-	$(MAKE) $(ZLIB_TARGET_BUILD_DIR)/.installed
-
-$(ZLIB_TARGET_BUILD_DIR)/.installed: download_zlib \
-	$(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)
-ifeq ($(CONFIG_EMBTK_ZLIB_NEED_PATCH),y)
-	@cd $(PACKAGES_BUILD)/zlib-$(ZLIB_VERSION); \
-	patch -p1 < $(DOWNLOAD_DIR)/zlib-$(ZLIB_VERSION).patch
-endif
-	@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)" \
-	CPPFLAGS="-I$(SYSROOT)/usr/include" \
-	PKG_CONFIG=$(PKGCONFIG_BIN) \
-	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	./configure \
-	--libdir=/usr/$(LIBDIR) --prefix=/usr
-	@touch $@
-
-zlib_target_clean:
-	$(call EMBTK_GENERIC_MESSAGE,"cleanup zlib...")
-	$(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)
-	$(Q)-rm -rf $(ZLIB_TARGET_BUILD_DIR)*
-
 ##########
 # Common #
 ##########
 
 #zlib download
-download_zlib:
-	$(call EMBTK_GENERIC_MESSAGE,"Downloading $(ZLIB_PACKAGE) if necessary...")
-	@test -e $(DOWNLOAD_DIR)/$(ZLIB_PACKAGE) || \
-	wget -O $(DOWNLOAD_DIR)/$(ZLIB_PACKAGE) $(ZLIB_SITE)/$(ZLIB_PACKAGE)
-ifeq ($(CONFIG_EMBTK_ZLIB_NEED_PATCH),y)
-	@cd $(PACKAGES_BUILD)/foo-$(ZLIB_VERSION); \
-	patch -p1 < $(DOWNLOAD_DIR)/zlib-$(ZLIB_VERSION).patch
-endif
+download_zlib download_zlib_host:
+	$(call EMBTK_DOWNLOAD_PKG,ZLIB)
diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk
index 21be65f..a0ceebc 100644
--- a/packages/graphics/freetype/freetype.mk
+++ b/packages/graphics/freetype/freetype.mk
@@ -38,7 +38,7 @@ FREETYPE_INCLUDES = ft*build.h freetype*
 FREETYPE_LIBS = libfreetype*
 FREETYPE_PKGCONFIGS = freetype*.pc
 
-FREETYPE_DEPS := zlib_target_install
+FREETYPE_DEPS := zlib_install
 
 freetype_install:
 	@test -e $(FREETYPE_BUILD_DIR)/.installed || \
diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk
index 414394e..9917528 100644
--- a/packages/graphics/libpng/libpng.mk
+++ b/packages/graphics/libpng/libpng.mk
@@ -40,7 +40,7 @@ LIBPNG_PKGCONFIGS = libpng*
 
 LIBPNG_CONFIGURE_OPTS := --with-libpng-compat=no
 
-LIBPNG_DEPS := zlib_target_install
+LIBPNG_DEPS := zlib_install
 
 libpng_install:
 	@test -e $(LIBPNG_BUILD_DIR)/.installed || \
diff --git a/packages/misc/glib/glib.mk b/packages/misc/glib/glib.mk
index 7d483fe..e999b8c 100644
--- a/packages/misc/glib/glib.mk
+++ b/packages/misc/glib/glib.mk
@@ -50,7 +50,7 @@ GLIB_CONFIGURE_ENV	:= glib_cv_stack_grows=no			\
 
 GLIB_CONFIGURE_OPTS	:= --disable-fam
 
-GLIB_DEPS := zlib_target_install gettext_install
+GLIB_DEPS := zlib_install gettext_install
 
 glib_install:
 	$(call EMBTK_INSTALL_PKG,GLIB)
diff --git a/packages/x11/libfontenc/libfontenc.mk b/packages/x11/libfontenc/libfontenc.mk
index 0e4b184..fe1c8ea 100644
--- a/packages/x11/libfontenc/libfontenc.mk
+++ b/packages/x11/libfontenc/libfontenc.mk
@@ -40,7 +40,7 @@ LIBFONTENC_PKGCONFIGS = libfontenc.pc
 
 LIBFONTENC_CONFIGURE_OPTS := --disable-malloc0returnsnull
 
-LIBFONTENC_DEPS := zlib_target_install
+LIBFONTENC_DEPS := zlib_install
 
 libfontenc_install:
 	@test -e $(LIBFONTENC_BUILD_DIR)/.installed || \