X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fhost-build.mk;h=126671a0b3d3ce8718c19b022efaf64602ce647a;hp=af46c3e24539c07cd92d4dad61cd2791c80c9393;hb=d1969d761fc2c0d88b2970c9447d36bc67e108a6;hpb=63129f9b4c90013989b7e4bd5689b558dd218d27 diff --git a/include/host-build.mk b/include/host-build.mk index af46c3e245..126671a0b3 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,13 +7,27 @@ HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) 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),\ + $(if $(CONFIG_PKG_BUILD_PARALLEL),$(HOST_MAKE_J),-j1),-j1) +endif include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk BUILD_TYPES += host -HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),))) +HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))) HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed @@ -22,6 +36,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)),) @@ -36,7 +51,9 @@ define Host/Prepare endef HOST_CONFIGURE_VARS = \ - CPPFLAGS="$(HOST_CFLAGS)" \ + CC="$(HOSTCC)" \ + CFLAGS="$(HOST_CFLAGS)" \ + CPPFLAGS="$(HOST_CPPFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ SHELL="$(BASH)" @@ -49,12 +66,21 @@ 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 +HOST_MAKE_FLAGS = + +HOST_CONFIGURE_CMD = $(BASH) ./configure + +ifneq ($(HOST_OS),Darwin) + ifeq ($(CONFIG_BUILD_STATIC_TOOLS),y) + HOST_STATIC_LINKING = -static + endif +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) \ @@ -71,7 +97,9 @@ define Host/Configure endef define Host/Compile/Default - $(MAKE) -C $(HOST_BUILD_DIR) $(1) + +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ + $(HOST_MAKE_FLAGS) \ + $(1) endef define Host/Compile @@ -79,7 +107,7 @@ define Host/Compile endef define Host/Install/Default - $(MAKE) -C $(HOST_BUILD_DIR) install + $(_SINGLE)$(MAKE) -C $(HOST_BUILD_DIR) install endef define Host/Install @@ -89,7 +117,7 @@ endef ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),) define HostHost/Autoclean - $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(HOST_STAMP_PREPARED)) + $(call rdep,${CURDIR} $(PKG_FILE_DEPENDS),$(HOST_STAMP_PREPARED)) $(if $(if $(Host/Compile),$(filter prepare,$(MAKECMDGOALS)),1),,$(call rdep,$(HOST_BUILD_DIR),$(HOST_STAMP_BUILT))) endef endif @@ -101,6 +129,7 @@ define Download/default SUBDIR:=$(PKG_SOURCE_SUBDIR) VERSION:=$(PKG_SOURCE_VERSION) MD5SUM:=$(PKG_MD5SUM) + MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM) endef define Host/Exports/Default @@ -111,6 +140,8 @@ define Host/Exports/Default endef Host/Exports=$(Host/Exports/Default) +.NOTPARALLEL: + ifndef DUMP define HostBuild $(if $(HOST_QUILT),$(Host/Quilt)) @@ -120,27 +151,30 @@ 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,$(STAMP_CONFIGURED)) + $(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,$(STAMP_BUILT)) + $(call Host/Exports,$(HOST_STAMP_BUILT)) $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) - $(call Host/Compile) - touch $$@ + $(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) - $(call Host/Install) - mkdir -p $$(shell dirname $$@) - touch $$@ - - ifdef Host/Install - host-install: $(HOST_STAMP_INSTALLED) - endif + $(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 $$@ ifndef STAMP_BUILT prepare: host-prepare @@ -148,13 +182,13 @@ ifndef DUMP install: host-install clean: host-clean update: host-update - else - host-compile: $(HOST_STAMP_INSTALLED) + refresh: host-refresh endif + host-prepare: $(HOST_STAMP_PREPARED) host-configure: $(HOST_STAMP_CONFIGURED) - host-compile: $(HOST_STAMP_BUILT) - host-install: + host-compile: $(HOST_STAMP_BUILT) $(if $(STAMP_BUILT),$(HOST_STAMP_INSTALLED)) + host-install: $(HOST_STAMP_INSTALLED) host-clean: FORCE $(call Host/Clean) $(call Host/Uninstall) @@ -169,4 +203,3 @@ ifndef DUMP clean: endif -