X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9d3a35f2c71eb2730ae2b72d0474e116609509c9..9db1664fbe7461d7d0a88be682d364e2eb9aec2c:/include/host-build.mk diff --git a/include/host-build.mk b/include/host-build.mk index 4fd6587ae..df7d60611 100644 --- 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)$(CONFIG_PKG_DEFAULT_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 @@ -24,6 +30,7 @@ override MAKEFLAGS= include $(INCLUDE_DIR)/download.mk include $(INCLUDE_DIR)/quilt.mk +include $(INCLUDE_DIR)/autotools.mk Host/Patch:=$(Host/Patch/Default) ifneq ($(strip $(HOST_UNPACK)),) @@ -38,6 +45,7 @@ define Host/Prepare endef HOST_CONFIGURE_VARS = \ + CC="$(HOSTCC)" \ CFLAGS="$(HOST_CFLAGS)" \ CPPFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ @@ -52,7 +60,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 @@ -123,12 +132,16 @@ ifndef DUMP $(HOST_STAMP_PREPARED): @-rm -rf $(HOST_BUILD_DIR) @mkdir -p $(HOST_BUILD_DIR) + $(foreach hook,$(Hooks/HostPrepare/Pre),$(call $(hook))$(sep)) $(call Host/Prepare) + $(foreach hook,$(Hooks/HostPrepare/Post),$(call $(hook))$(sep)) touch $$@ $(call Host/Exports,$(HOST_STAMP_CONFIGURED)) $(HOST_STAMP_CONFIGURED): $(HOST_STAMP_PREPARED) + $(foreach hook,$(Hooks/HostConfigure/Pre),$(call $(hook))$(sep)) $(call Host/Configure) + $(foreach hook,$(Hooks/HostConfigure/Post),$(call $(hook))$(sep)) touch $$@ $(call Host/Exports,$(HOST_STAMP_BUILT)) @@ -142,19 +155,26 @@ ifndef DUMP install: host-install clean: host-clean update: host-update + refresh: host-refresh $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) + $(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep)) $(call Host/Compile) + $(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep)) touch $$@ - $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) + $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE) $(call Host/Install) + $(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep)) mkdir -p $$(shell dirname $$@) touch $$@ else - $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) + $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(if $(FORCE_HOST_INSTALL),FORCE) + $(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep)) $(call Host/Compile) + $(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep)) $(call Host/Install) + $(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep)) touch $$@ endif host-prepare: $(HOST_STAMP_PREPARED) @@ -175,4 +195,3 @@ ifndef DUMP clean: endif -