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

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

3 files changed, 57 insertions, 31 deletions

diff --git a/packages/graphics/graphics.mk b/packages/graphics/graphics.mk
index 104d48d..023a884 100644
--- a/packages/graphics/graphics.mk
+++ b/packages/graphics/graphics.mk
@@ -58,6 +58,7 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_IMLIB2) += imlib2_install
 #libjpeg
 include $(EMBTK_ROOT)/packages/graphics/libjpeg/libjpeg.mk
 ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBJPEG) += libjpeg_install
+HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_LIBJPEG) += libjpeg_host_install
 
 #libpng
 include $(EMBTK_ROOT)/packages/graphics/libpng/libpng.mk
diff --git a/packages/graphics/libjpeg/libjpeg.kconfig b/packages/graphics/libjpeg/libjpeg.kconfig
index 0e0220e..3fecb0c 100644
--- a/packages/graphics/libjpeg/libjpeg.kconfig
+++ b/packages/graphics/libjpeg/libjpeg.kconfig
@@ -23,6 +23,12 @@
 # \date         October 2009
 ################################################################################
 
+config EMBTK_HOST_HAVE_LIBJPEG
+	bool
+	select EMBTK_LIBJPEG_PKG_IS_TARGZ
+	help
+		JPEG (pronounced "jay-peg") for host development machine.
+
 config EMBTK_HAVE_LIBJPEG
 	bool "Have libjpeg"
 	select EMBTK_LIBJPEG_PKG_IS_TARGZ
@@ -33,7 +39,7 @@ config EMBTK_HAVE_LIBJPEG
 
 choice
 	prompt "libjpeg version you wish"
-	depends on EMBTK_HAVE_LIBJPEG
+	depends on EMBTK_HAVE_LIBJPEG || EMBTK_HOST_HAVE_LIBJPEG
 	help
 		Here you can choose which version of libjpeg you want to use.
 
@@ -50,9 +56,22 @@ config	EMBTK_LIBJPEG_VERSION_STRING
 
 config EMBTK_LIBJPEG_NEED_PATCH
 	bool
+	select EMBTK_LIBJPEG_HOST_NEED_PATCH
 config EMBTK_LIBJPEG_NEED_AUTORECONF
 	bool
+	select EMBTK_LIBJPEG_HOST_NEED_AUTORECONF
 config EMBTK_LIBJPEG_PKG_IS_TARGZ
 	bool
+	select EMBTK_LIBJPEG_HOST_PKG_IS_TARGZ
 config EMBTK_LIBJPEG_PKG_IS_TARBZ2
 	bool
+	select EMBTK_LIBJPEG_HOST_PKG_IS_TARBZ2
+
+config EMBTK_LIBJPEG_HOST_NEED_PATCH
+	bool
+config EMBTK_LIBJPEG_HOST_NEED_AUTORECONF
+	bool
+config EMBTK_LIBJPEG_HOST_PKG_IS_TARGZ
+	bool
+config EMBTK_LIBJPEG_HOST_PKG_IS_TARBZ2
+	bool
diff --git a/packages/graphics/libjpeg/libjpeg.mk b/packages/graphics/libjpeg/libjpeg.mk
index d0e8407..fab3f54 100644
--- a/packages/graphics/libjpeg/libjpeg.mk
+++ b/packages/graphics/libjpeg/libjpeg.mk
@@ -23,43 +23,49 @@
 # \date         October 2009
 ################################################################################
 
-LIBJPEG_NAME := jpeg
-LIBJPEG_VERSION := $(call embtk_get_pkgversion,LIBJPEG)
-LIBJPEG_SITE := http://www.ijg.org/files
-LIBJPEG_SITE_MIRROR3 := ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
-LIBJPEG_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/jpeg/$(LIBJPEG_VERSION)
-LIBJPEG_PACKAGE := jpegsrc.v$(LIBJPEG_VERSION).tar.gz
-LIBJPEG_SRC_DIR := $(PACKAGES_BUILD)/jpeg-$(LIBJPEG_VERSION)
-LIBJPEG_BUILD_DIR := $(PACKAGES_BUILD)/jpeg-$(LIBJPEG_VERSION)
+LIBJPEG_NAME		:= jpeg
+LIBJPEG_VERSION		:= $(call embtk_get_pkgversion,libjpeg)
+LIBJPEG_SITE		:= http://www.ijg.org/files
+LIBJPEG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
+LIBJPEG_PATCH_SITE	:= ftp://ftp.embtoolkit.org/embtoolkit.org/jpeg/$(LIBJPEG_VERSION)
+LIBJPEG_PACKAGE		:= jpegsrc.v$(LIBJPEG_VERSION).tar.gz
+LIBJPEG_SRC_DIR		:= $(PACKAGES_BUILD)/jpeg-$(LIBJPEG_VERSION)
+LIBJPEG_BUILD_DIR	:= $(PACKAGES_BUILD)/jpeg-$(LIBJPEG_VERSION)
 
-LIBJPEG_BINS := cjpeg djpeg jpegtran rdjpgcom wrjpgcom
-LIBJPEG_SBINS :=
-LIBJPEG_LIBS := libjpeg*
-LIBJPEG_INCLUDES := jconfig.h jerror.h jmorecfg.h jpeglib.h
+LIBJPEG_BINS		:= cjpeg djpeg jpegtran rdjpgcom wrjpgcom
+LIBJPEG_SBINS		:=
+LIBJPEG_LIBS		:= libjpeg*
+LIBJPEG_INCLUDES	:= jconfig.h jerror.h jmorecfg.h jpeglib.h
 
 LIBJPEG_CONFIGURE_OPTS := --program-suffix=""
 
 libjpeg_install:
-	@test -e $(LIBJPEG_BUILD_DIR)/.installed || \
-	$(MAKE) $(LIBJPEG_BUILD_DIR)/.installed
+	$(call embtk_install_pkg,libjpeg)
 
-$(LIBJPEG_BUILD_DIR)/.installed: download_libjpeg \
-	$(LIBJPEG_BUILD_DIR)/.decompressed $(LIBJPEG_BUILD_DIR)/.configured
-	$(call embtk_generic_message,"Compiling and installing \
-	jpeg-$(LIBJPEG_VERSION) in your root filesystem...")
-	$(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(LIBJPEG_BUILD_DIR) DESTDIR=$(SYSROOT) install
-	$(Q)$(MAKE) libtool_files_adapt
-	@touch $@
+libjpeg_clean:
+	$(call embtk_cleanup_pkg,libjpeg)
 
-download_libjpeg:
-	$(call embtk_download_pkg,LIBJPEG)
+#
+# libjpeg for host development machine
+#
+LIBJPEG_HOST_NAME		:= $(LIBJPEG_NAME)
+LIBJPEG_HOST_VERSION		:= $(LIBJPEG_VERSION)
+LIBJPEG_HOST_SITE		:= $(LIBJPEG_SITE)
+LIBJPEG_HOST_SITE_MIRROR1	:= $(LIBJPEG_SITE_MIRROR1)
+LIBJPEG_HOST_SITE_MIRROR2	:= $(LIBJPEG_SITE_MIRROR2)
+LIBJPEG_HOST_SITE_MIRROR3	:= $(LIBJPEG_SITE_MIRROR3)
+LIBJPEG_HOST_PATCH_SITE		:= $(LIBJPEG_PATCH_SITE)
+LIBJPEG_HOST_PACKAGE		:= $(LIBJPEG_PACKAGE)
+LIBJPEG_HOST_SRC_DIR		:= $(TOOLS_BUILD)/jpeg-$(LIBJPEG_VERSION)
+LIBJPEG_HOST_BUILD_DIR		:= $(TOOLS_BUILD)/jpeg-$(LIBJPEG_VERSION)
 
-$(LIBJPEG_BUILD_DIR)/.decompressed:
-	$(call embtk_decompress_pkg,LIBJPEG)
+LIBJPEG_HOST_CONFIGURE_OPTS	:= --program-suffix=""
 
-$(LIBJPEG_BUILD_DIR)/.configured:
-	$(call embtk_configure_pkg,LIBJPEG)
+libjpeg_host_install:
+	$(call embtk_install_hostpkg,libjpeg_host)
 
-libjpeg_clean:
-	$(call embtk_cleanup_pkg,LIBJPEG)
+#
+# Common for host and target
+#
+download_libjpeg download_libjpeg_host:
+	$(call embtk_download_pkg,libjpeg)