Packages: libpng: give ability to build libpng for host development machine

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

2 files changed, 62 insertions, 36 deletions

diff --git a/packages/graphics/libpng/libpng.kconfig b/packages/graphics/libpng/libpng.kconfig
index 6067d08..e52ac20 100644
--- a/packages/graphics/libpng/libpng.kconfig
+++ b/packages/graphics/libpng/libpng.kconfig
@@ -23,6 +23,13 @@
 # \date         October 2009
 ################################################################################
 
+config EMBTK_HOST_HAVE_LIBPNG
+	bool
+	select EMBTK_LIBPNG_PKG_IS_TARGZ
+	select EMBTK_HOST_HAVE_ZLIB
+	help
+		libpng for host development machine.
+
 config EMBTK_HAVE_LIBPNG
 	bool "Have libpng"
 	select EMBTK_LIBPNG_PKG_IS_TARGZ
@@ -34,7 +41,7 @@ config EMBTK_HAVE_LIBPNG
 
 choice
 	prompt "libpng version you wish"
-	depends on EMBTK_HAVE_LIBPNG
+	depends on EMBTK_HAVE_LIBPNG || EMBTK_HOST_HAVE_LIBPNG
 	help
 		Here you can choose which version of libpng you want to use.
 
@@ -69,9 +76,22 @@ config EMBTK_LIBPNG_VERSION_STRING
 
 config EMBTK_LIBPNG_NEED_PATCH
 	bool
+	select EMBTK_LIBPNG_HOST_NEED_PATCH
 config EMBTK_LIBPNG_NEED_AUTORECONF
 	bool
+	select EMBTK_LIBPNG_HOST_NEED_AUTORECONF
 config EMBTK_LIBPNG_PKG_IS_TARGZ
 	bool
+	select EMBTK_LIBPNG_HOST_PKG_IS_TARGZ
 config EMBTK_LIBPNG_PKG_IS_TARBZ2
 	bool
+	select EMBTK_LIBPNG_HOST_PKG_IS_TARBZ2
+
+config EMBTK_LIBPNG_HOST_NEED_PATCH
+	bool
+config EMBTK_LIBPNG_HOST_NEED_AUTORECONF
+	bool
+config EMBTK_LIBPNG_HOST_PKG_IS_TARGZ
+	bool
+config EMBTK_LIBPNG_HOST_PKG_IS_TARBZ2
+	bool
diff --git a/packages/graphics/libpng/libpng.mk b/packages/graphics/libpng/libpng.mk
index 2171006..93e45df 100644
--- a/packages/graphics/libpng/libpng.mk
+++ b/packages/graphics/libpng/libpng.mk
@@ -23,47 +23,53 @@
 # \date         October 2009
 ################################################################################
 
-LIBPNG_NAME := libpng
-LIBPNG_VERSION := $(call embtk_get_pkgversion,LIBPNG)
-LIBPNG_SITE := http://download.sourceforge.net/libpng
-LIBPNG_PACKAGE := libpng-$(LIBPNG_VERSION).tar.gz
-LIBPNG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBPNG_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/libpng/$(LIBPNG_VERSION)
-LIBPNG_SRC_DIR := $(PACKAGES_BUILD)/libpng-$(LIBPNG_VERSION)
-LIBPNG_BUILD_DIR := $(PACKAGES_BUILD)/libpng-$(LIBPNG_VERSION)
+LIBPNG_NAME		:= libpng
+LIBPNG_VERSION		:= $(call embtk_get_pkgversion,libpng)
+LIBPNG_SITE		:= http://download.sourceforge.net/libpng
+LIBPNG_PACKAGE		:= libpng-$(LIBPNG_VERSION).tar.gz
+LIBPNG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBPNG_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/libpng/$(LIBPNG_VERSION)
+LIBPNG_SRC_DIR		:= $(PACKAGES_BUILD)/libpng-$(LIBPNG_VERSION)
+LIBPNG_BUILD_DIR	:= $(PACKAGES_BUILD)/libpng-$(LIBPNG_VERSION)
 
-LIBPNG_BINS = libpng*
-LIBPNG_SBINS =
-LIBPNG_INCLUDES = libpng* png*
-LIBPNG_LIBS = libpng*
-LIBPNG_PKGCONFIGS = libpng*
+LIBPNG_BINS		= libpng*
+LIBPNG_SBINS		=
+LIBPNG_INCLUDES		= libpng* png*
+LIBPNG_LIBS		= libpng*
+LIBPNG_PKGCONFIGS	= libpng*
 
-LIBPNG_CONFIGURE_OPTS := --with-libpng-compat=no
-
-LIBPNG_DEPS := zlib_install
+LIBPNG_CONFIGURE_OPTS	:= --with-libpng-compat=no
+LIBPNG_DEPS		:= zlib_install
 
 libpng_install:
-	@test -e $(LIBPNG_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBPNG_BUILD_DIR)/.installed
+	$(call embtk_install_pkg,libpng)
+
+libpng_clean:
+	$(call embtk_cleanup_pkg,libpng)
 
-$(LIBPNG_BUILD_DIR)/.installed:  $(LIBPNG_DEPS) download_libpng \
-	$(LIBPNG_BUILD_DIR)/.decompressed $(LIBPNG_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	libpng-$(LIBPNG_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBPNG_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	$(Q)$(MAKE) pkgconfig_files_adapt
-	@touch $@
+#
+# libpng for host development machine
+#
 
-download_libpng:
-	$(call embtk_download_pkg,LIBPNG)
+LIBPNG_HOST_NAME		:= $(LIBPNG_NAME)
+LIBPNG_HOST_VERSION		:= $(LIBPNG_VERSION)
+LIBPNG_HOST_SITE		:= $(LIBPNG_SITE)
+LIBPNG_HOST_PACKAGE		:= $(LIBPNG_PACKAGE)
+LIBPNG_HOST_SITE_MIRROR1	:= $(LIBPNG_SITE_MIRROR1)
+LIBPNG_HOST_SITE_MIRROR2	:= $(LIBPNG_SITE_MIRROR2)
+LIBPNG_HOST_SITE_MIRROR3	:= $(LIBPNG_SITE_MIRROR3)
+LIBPNG_HOST_PATCH_SITE		:= $(LIBPNG_PATCH_SITE)
+LIBPNG_HOST_SRC_DIR		:= $(TOOLS_BUILD)/libpng-$(LIBPNG_VERSION)
+LIBPNG_HOST_BUILD_DIR		:= $(TOOLS_BUILD)/libpng-$(LIBPNG_VERSION)
 
-$(LIBPNG_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,LIBPNG)
+LIBPNG_HOST_CONFIGURE_OPTS	:= --with-libpng-compat=no
+LIBPNG_HOST_DEPS		:= zlib_host_install
 
-$(LIBPNG_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,LIBPNG)
+libpng_host_install:
+	$(call embtk_install_hostpkg,libpng_host)
 
-libpng_clean:
-	$(call embtk_cleanup_pkg,LIBPNG)
+#
+# Common for target and host
+#
+download_libpng download_libpng_host:
+	$(call embtk_download_pkg,libpng)