projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[docs] update VLAN tag example
[openwrt.git]
/
include
/
host-build.mk
diff --git
a/include/host-build.mk
b/include/host-build.mk
index
c4fcf94
..
60b7b9f
100644
(file)
--- a/
include/host-build.mk
+++ b/
include/host-build.mk
@@
-9,11
+9,17
@@
HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSIO
HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
HOST_BUILD_PARALLEL ?=
HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
HOST_BUILD_PARALLEL ?=
+ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),)
+ HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j)
+else
+ HOST_MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS)
+endif
+
ifeq ($(strip $(HOST_BUILD_PARALLEL)),0)
HOST_JOBS?=-j1
else
HOST_JOBS?=$(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_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)
+ $(if $(CONFIG_PKG_BUILD_PARALLEL),
$(HOST_MAKE_J
),-j1),-j1)
endif
include $(INCLUDE_DIR)/host.mk
endif
include $(INCLUDE_DIR)/host.mk
@@
-63,6
+69,8
@@
HOST_CONFIGURE_ARGS = \
--localstatedir=$(STAGING_DIR_HOST)/var \
--sbindir=$(STAGING_DIR_HOST)/bin
--localstatedir=$(STAGING_DIR_HOST)/var \
--sbindir=$(STAGING_DIR_HOST)/bin
+HOST_MAKE_FLAGS =
+
HOST_CONFIGURE_CMD = ./configure
ifneq ($(HOST_OS),Darwin)
HOST_CONFIGURE_CMD = ./configure
ifneq ($(HOST_OS),Darwin)
@@
-72,7
+80,7
@@
ifneq ($(HOST_OS),Darwin)
endif
define Host/Configure/Default
endif
define Host/Configure/Default
- (cd $(HOST_BUILD_DIR)/$(3); \
+
$(if $(HOST_CONFIGURE_PARALLEL),+)
(cd $(HOST_BUILD_DIR)/$(3); \
if [ -x configure ]; then \
$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \
$(2) \
if [ -x configure ]; then \
$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \
$(2) \
@@
-89,7
+97,9
@@
define Host/Configure
endef
define Host/Compile/Default
endef
define Host/Compile/Default
- $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) $(1)
+ +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
+ $(HOST_MAKE_FLAGS) \
+ $(1)
endef
define Host/Compile
endef
define Host/Compile
@@
-130,6
+140,8
@@
define Host/Exports/Default
endef
Host/Exports=$(Host/Exports/Default)
endef
Host/Exports=$(Host/Exports/Default)
+.NOTPARALLEL:
+
ifndef DUMP
define HostBuild
$(if $(HOST_QUILT),$(Host/Quilt))
ifndef DUMP
define HostBuild
$(if $(HOST_QUILT),$(Host/Quilt))