X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fhost-build.mk;h=6fc29b3a97925ea9342dc35d5ad4566b40bfe9d8;hb=1e7129ca5042cd2a8ee1b3c679ce3eedca1846d4;hp=1b7f354066ece81a3aa0f131bd61baba3d24c33b;hpb=dc7a68165dcfe62c16d46a1c093b531ebaae441c;p=openwrt%2Fstaging%2Fchunkeey.git diff --git a/include/host-build.mk b/include/host-build.mk index 1b7f354066..6fc29b3a97 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -30,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)),) @@ -44,6 +45,7 @@ define Host/Prepare endef HOST_CONFIGURE_VARS = \ + CC="$(HOSTCC)" \ CFLAGS="$(HOST_CFLAGS)" \ CPPFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ @@ -58,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 @@ -110,6 +113,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 @@ -129,12 +133,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)) @@ -148,19 +156,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) @@ -181,4 +196,3 @@ ifndef DUMP clean: endif -