Packages: glib: install glib host when needed

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

3 files changed, 55 insertions, 9 deletions

diff --git a/packages/misc/glib/glib.kconfig b/packages/misc/glib/glib.kconfig
index ace5ea5..8c5fcc0 100644
--- a/packages/misc/glib/glib.kconfig
+++ b/packages/misc/glib/glib.kconfig
@@ -23,9 +23,17 @@
 # \date         December 2009
 ################################################################################
 
+config EMBTK_HOST_HAVE_GLIB
+	bool
+	select EMBTK_GLIB_PKG_IS_TARBZ2
+	select EMBTK_HOST_HAVE_GETTEXT
+	help
+		Have glib for host development machine.
+
 config EMBTK_HAVE_GLIB
 	bool "Have GLib"
 	select EMBTK_GLIB_PKG_IS_TARBZ2
+	select EMBTK_HOST_HAVE_GLIB
 	select EMBTK_HAVE_GETTEXT
 	select EMBTK_HAVE_ZLIB
 	select KEMBTK_UCLIBC_DO_C99_MATH if EMBTK_CLIB_UCLIBC
@@ -48,7 +56,7 @@ config EMBTK_HAVE_GLIB
 		operation.
 choice
 	prompt "GLib version you wish"
-	depends on EMBTK_HAVE_GLIB
+	depends on EMBTK_HAVE_GLIB || EMBTK_HOST_HAVE_GLIB
 	help
 		Here you can choose which version of GLib you want to use.
 
@@ -70,9 +78,22 @@ config EMBTK_GLIB_VERSION_STRING
 
 config EMBTK_GLIB_NEED_PATCH
 	bool
+	select EMBTK_GLIB_HOST_NEED_PATCH
 config EMBTK_GLIB_NEED_AUTORECONF
 	bool
+	select EMBTK_GLIB_HOST_NEED_AUTORECONF
 config EMBTK_GLIB_PKG_IS_TARGZ
 	bool
+	select EMBTK_GLIB_HOST_PKG_IS_TARGZ
 config EMBTK_GLIB_PKG_IS_TARBZ2
 	bool
+	select EMBTK_GLIB_HOST_PKG_IS_TARBZ2
+
+config EMBTK_GLIB_HOST_NEED_PATCH
+	bool
+config EMBTK_GLIB_HOST_NEED_AUTORECONF
+	bool
+config EMBTK_GLIB_HOST_PKG_IS_TARGZ
+	bool
+config EMBTK_GLIB_HOST_PKG_IS_TARBZ2
+	bool
diff --git a/packages/misc/glib/glib.mk b/packages/misc/glib/glib.mk
index 58e2a6d..f7ae8a0 100644
--- a/packages/misc/glib/glib.mk
+++ b/packages/misc/glib/glib.mk
@@ -24,8 +24,8 @@
 ################################################################################
 
 GLIB_NAME		:= glib
-GLIB_MAJOR_VERSION	:= $(call embtk_get_pkgversion,GLIB_MAJOR)
-GLIB_VERSION		:= $(call embtk_get_pkgversion,GLIB)
+GLIB_MAJOR_VERSION	:= $(call embtk_get_pkgversion,glib_major)
+GLIB_VERSION		:= $(call embtk_get_pkgversion,glib)
 GLIB_SITE		:= http://ftp.gnome.org/pub/gnome/sources/glib/$(GLIB_MAJOR_VERSION)
 GLIB_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 GLIB_PATCH_SITE		:= ftp://ftp.embtoolkit.org/embtoolkit.org/glib/$(GLIB_VERSION)
@@ -50,16 +50,13 @@ GLIB_CONFIGURE_ENV	:= glib_cv_stack_grows=no			\
 
 GLIB_CONFIGURE_OPTS	:= --disable-fam
 
-GLIB_DEPS := zlib_install gettext_install
+GLIB_DEPS		:= zlib_install gettext_install glib_host_install
 
 glib_install:
-	$(call embtk_install_pkg,GLIB)
+	$(call embtk_install_pkg,glib)
 	@test -e $(GLIB_BUILD_DIR)/.patchlibtool || \
 	$(MAKE) $(GLIB_BUILD_DIR)/.patchlibtool
 
-download_glib:
-	$(call embtk_download_pkg,GLIB)
-
 #FIXME: this should be fixed in glib2 project
 $(GLIB_BUILD_DIR)/.patchlibtool:
 	$(Q)sed \
@@ -85,5 +82,32 @@ $(GLIB_BUILD_DIR)/.patchlibtool:
 	@touch $@
 
 glib_clean:
-	$(call embtk_cleanup_pkg,GLIB)
+	$(call embtk_cleanup_pkg,glib)
+
+#
+# glib for host
+#
+GLIB_HOST_NAME		:= $(GLIB_NAME)
+GLIB_HOST_MAJOR_VERSION	:= $(GLIB_MAJOR_VERSION)
+GLIB_HOST_VERSION	:= $(GLIB_VERSION)
+GLIB_HOST_SITE		:= $(GLIB_SITE)
+GLIB_HOST_SITE_MIRROR1	:= $(GLIB_SITE_MIRROR1)
+GLIB_HOST_SITE_MIRROR2	:= $(GLIB_SITE_MIRROR2)
+GLIB_HOST_SITE_MIRROR3	:= $(GLIB_SITE_MIRROR3)
+GLIB_HOST_PATCH_SITE	:= $(GLIB_PATCH_SITE)
+GLIB_HOST_PACKAGE	:= $(GLIB_PACKAGE)
+GLIB_HOST_SRC_DIR	:= $(TOOLS_BUILD)/glib-$(GLIB_VERSION)
+GLIB_HOST_BUILD_DIR	:= $(TOOLS_BUILD)/glib-$(GLIB_VERSION)
+
 
+GLIB_HOST_CONFIGURE_OPTS	:= --disable-fam
+GLIB_HOST_DEPS			:= gettext_host_install
+
+glib_host_install:
+	$(call embtk_install_hostpkg,glib_host)
+
+#
+# Common for target and host
+#
+download_glib download_glib_host:
+	$(call embtk_download_pkg,glib)
diff --git a/packages/misc/misc.mk b/packages/misc/misc.mk
index 1548c60..045ead0 100644
--- a/packages/misc/misc.mk
+++ b/packages/misc/misc.mk
@@ -34,6 +34,7 @@ HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_GETTEXT) += gettext_host_install
 #GLib
 include $(EMBTK_ROOT)/packages/misc/glib/glib.mk
 ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_GLIB) += glib_install
+HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_GLIB) += glib_host_install
 
 #gperf
 include $(EMBTK_ROOT)/packages/misc/gperf/gperf.mk