X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=include%2Fhost-build.mk;h=df7d60611ee07fe95cfd497d093c2938f5105344;hp=3f714cd6821947912627e06c8d9b06c863fa7ef4;hb=e46281a91ae070724f3f76d24bbf89ab0e70f36f;hpb=fb1df77a7cdb0a80503abbb6ba8003ff4e3308ae diff --git a/include/host-build.mk b/include/host-build.mk index 3f714cd682..df7d60611e 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -1,18 +1,27 @@ -# -# Copyright (C) 2006-2008 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. # HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) -PKG_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install +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)/depends.mk -HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),))) +BUILD_TYPES += host +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 @@ -21,11 +30,12 @@ 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)),) define Host/Prepare/Default - $(HOST_UNPACK) + $(HOST_UNPACK) $(Host/Patch) endef endif @@ -34,27 +44,37 @@ define Host/Prepare $(call Host/Prepare/Default) endef +HOST_CONFIGURE_VARS = \ + CC="$(HOSTCC)" \ + CFLAGS="$(HOST_CFLAGS)" \ + CPPFLAGS="$(HOST_CFLAGS)" \ + LDFLAGS="$(HOST_LDFLAGS)" \ + SHELL="$(BASH)" + +HOST_CONFIGURE_ARGS = \ + --target=$(GNU_HOST_NAME) \ + --host=$(GNU_HOST_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=$(STAGING_DIR_HOST) \ + --exec-prefix=$(STAGING_DIR_HOST) \ + --sysconfdir=$(STAGING_DIR_HOST)/etc \ + --localstatedir=$(STAGING_DIR_HOST)/var \ + --sbindir=$(STAGING_DIR_HOST)/bin + +HOST_CONFIGURE_CMD = ./configure + define Host/Configure/Default - @(cd $(HOST_BUILD_DIR)/$(3); \ - [ -x configure ] && \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \ - $(2) \ - CPPFLAGS="$(HOST_CFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" \ - SHELL="$(BASH)" \ - ./configure \ - --target=$(GNU_HOST_NAME) \ - --host=$(GNU_HOST_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=$(STAGING_DIR_HOST) \ - --exec-prefix=$(STAGING_DIR_HOST) \ - --sysconfdir=$(STAGING_DIR_HOST)/etc \ - --localstatedir=$(STAGING_DIR_HOST)/var \ - $(DISABLE_NLS) \ - $(1); \ - true; \ + (cd $(HOST_BUILD_DIR)/$(3); \ + if [ -x configure ]; then \ + $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \ + $(2) \ + $(HOST_CONFIGURE_CMD) \ + $(HOST_CONFIGURE_VARS) \ + $(HOST_CONFIGURE_ARGS) \ + $(1); \ + fi \ ) endef @@ -63,16 +83,25 @@ define Host/Configure endef define Host/Compile/Default - $(MAKE) -C $(HOST_BUILD_DIR) $(1) + $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) $(1) endef define Host/Compile $(call Host/Compile/Default) endef -ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),) +define Host/Install/Default + $(_SINGLE)$(MAKE) -C $(HOST_BUILD_DIR) install +endef + +define Host/Install + $(call Host/Install/Default) +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 @@ -86,46 +115,83 @@ define Download/default MD5SUM:=$(PKG_MD5SUM) endef -define HostBuild - $(if $(QUILT),$(Host/Quilt)) - $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)) +define Host/Exports/Default + $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-*),-I $$(p)) + $(1) : export STAGING_PREFIX=$$(STAGING_DIR_HOST) + $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig + $(1) : export PKG_CONFIG_LIBDIR=$$(STAGING_DIR_HOST)/lib/pkgconfig +endef +Host/Exports=$(Host/Exports/Default) + +ifndef DUMP + define HostBuild + $(if $(HOST_QUILT),$(Host/Quilt)) + $(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))) $(if $(DUMP),,$(call HostHost/Autoclean)) - + $(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 $$@ - $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) - $(call Host/Compile) - touch $$@ - - $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) - $(call Host/Install) - mkdir -p $$(shell dirname $$@) - touch $$@ - + $(call Host/Exports,$(HOST_STAMP_BUILT)) ifdef Host/Install - install: $(HOST_STAMP_INSTALLED) + host-install: $(if $(STAMP_BUILT),$(HOST_STAMP_BUILT),$(HOST_STAMP_INSTALLED)) endif - package-clean: FORCE + ifndef STAMP_BUILT + prepare: host-prepare + compile: host-compile + 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) $(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) $(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) + host-configure: $(HOST_STAMP_CONFIGURED) + host-compile: $(HOST_STAMP_BUILT) + host-install: + host-clean: FORCE $(call Host/Clean) $(call Host/Uninstall) - rm -f $(HOST_STAMP_INSTALLED) $(HOST_STAMP_BUILT) + rm -rf $(HOST_BUILD_DIR) $(HOST_STAMP_INSTALLED) $(HOST_STAMP_BUILT) + + endef download: - prepare: $(HOST_STAMP_PREPARED) - configure: $(HOST_STAMP_CONFIGURED) - compile: $(HOST_STAMP_BUILT) + prepare: + compile: install: - clean: FORCE - $(call Host/Clean) - rm -rf $(HOST_BUILD_DIR) + clean: -endef +endif