[ifxmips]:

[openwrt.git] / include / host-build.mk

diff --git a/include/host-build.mk b/include/host-build.mk
index 6324276..6f742d2 100644 (file)
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -7,6 +7,14 @@
 
 HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
 HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
 
 HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
 HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install

+HOST_BUILD_PARALLEL ?=
+
+ifeq ($(strip $(HOST_BUILD_PARALLEL)),0)
+HOST_JOBS?=-j1
+else
+HOST_JOBS?=$(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),\
+       $(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS),-j1),-j1)
+endif

 
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk


@@ -72,7 +80,7 @@ define Host/Configure
 endef
 
 define Host/Compile/Default
 endef
 
 define Host/Compile/Default

-       $(MAKE) -C $(HOST_BUILD_DIR) $(1)
+       $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) $(1)

 endef
 
 define Host/Compile
 endef
 
 define Host/Compile


@@ -80,7 +88,7 @@ define Host/Compile
 endef
 
 define Host/Install/Default
 endef
 
 define Host/Install/Default

-       $(MAKE) -C $(HOST_BUILD_DIR) install
+       $(_SINGLE)$(MAKE) -C $(HOST_BUILD_DIR) install

 endef
 
 define Host/Install
 endef
 
 define Host/Install


@@ -145,12 +153,12 @@ ifndef DUMP
                $(call Host/Compile)
                touch $$@
 
                $(call Host/Compile)
                touch $$@
 

-    $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT)
+    $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE)

                $(call Host/Install)
                mkdir -p $$(shell dirname $$@)
                touch $$@
   else
                $(call Host/Install)
                mkdir -p $$(shell dirname $$@)
                touch $$@
   else

-    $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED)
+    $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(if $(FORCE_HOST_INSTALL),FORCE)

                $(call Host/Compile)
                $(call Host/Install)
                touch $$@
                $(call Host/Compile)
                $(call Host/Install)
                touch $$@