Add an option to default the default build rule to parallel build.
authorMichael Büsch <mb@bu3sch.de>
Fri, 20 Aug 2010 14:48:59 +0000 (14:48 +0000)
committerMichael Büsch <mb@bu3sch.de>
Fri, 20 Aug 2010 14:48:59 +0000 (14:48 +0000)
SVN-Revision: 22737

Config.in
include/host-build.mk
include/package.mk

index 85d3adf..c750a25 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -247,6 +247,20 @@ menu "Global build settings"
                help
                  The number of jobs (-jX) to pass to packages submake.
 
+       config PKG_DEFAULT_PARALLEL
+               bool
+               prompt "Always parallelize the default package build rule (Dangerous)"
+               depends on PKG_BUILD_PARALLEL
+               default n
+               help
+                 Always set the default package build rules to parallel build.
+
+                 WARNING: This may break build or kill your cat, as it builds
+                 packages with multiple jobs that are probably not tested in
+                 a parallel build environment.
+
+                 Say N. Only say Y for testing.
+
        comment "Stripping options"
 
        choice
index acb7f6b..4fd6587 100644 (file)
@@ -8,7 +8,7 @@
 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)))
+HOST_JOBS ?= $(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),$(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS)))
 
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
index fd53123..a07d875 100644 (file)
@@ -11,7 +11,7 @@ PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
 PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
 PKG_MD5SUM ?= unknown
 PKG_BUILD_PARALLEL ?=
-PKG_JOBS ?= $(if $(PKG_BUILD_PARALLEL),$(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS)))
+PKG_JOBS ?= $(if $(PKG_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),$(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS)))
 
 include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/host.mk