projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use PREFIX/bin instead of PREFIX/sbin for all host builds (fixes e2fsprogs path)
[openwrt.git]
/
include
/
host-build.mk
diff --git
a/include/host-build.mk
b/include/host-build.mk
index
7579257
..
161192c
100644
(file)
--- a/
include/host-build.mk
+++ b/
include/host-build.mk
@@
-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
@@
-50,7
+58,8
@@
HOST_CONFIGURE_ARGS = \
--prefix=$(STAGING_DIR_HOST) \
--exec-prefix=$(STAGING_DIR_HOST) \
--sysconfdir=$(STAGING_DIR_HOST)/etc \
--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
HOST_CONFIGURE_CMD = ./configure
@@
-72,7
+81,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
@@
-145,12
+154,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 $$@
This page took
0.027475 seconds
and
4
git commands to generate.