[package] opkg: write error messages to stdout

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

diff --git a/include/host-build.mk b/include/host-build.mk
index acb7f6b..161192c 100644 (file)
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -8,7 +8,13 @@
 HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
 HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
 HOST_BUILD_PARALLEL ?=
-HOST_JOBS ?= $(if $(HOST_BUILD_PARALLEL),$(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS)))
+
+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
@@ -52,7 +58,8 @@ HOST_CONFIGURE_ARGS = \
        --prefix=$(STAGING_DIR_HOST) \
        --exec-prefix=$(STAGING_DIR_HOST) \
        --sysconfdir=$(STAGING_DIR_HOST)/etc \
-       --localstatedir=$(STAGING_DIR_HOST)/var
+       --localstatedir=$(STAGING_DIR_HOST)/var \
+       --sbindir=$(STAGING_DIR_HOST)/bin
 
 HOST_CONFIGURE_CMD = ./configure
 
@@ -147,12 +154,12 @@ ifndef DUMP
                $(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
-    $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED)
+    $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(if $(FORCE_HOST_INSTALL),FORCE)
                $(call Host/Compile)
                $(call Host/Install)
                touch $$@