X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=include%2Fhost-build.mk;h=4fd6587aec0a2623eb5b60197c00d6d1d427ce8e;hp=5622e987079711d3f3e38a2db17db5375f1eeec9;hb=18e0bc4cd5666a559bafc65c41b0c1b1fa211d18;hpb=21233cf0e901966665a6a99be58e3fad08128658 diff --git a/include/host-build.mk b/include/host-build.mk index 5622e98707..4fd6587aec 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -1,80 +1,99 @@ -# -# 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. # -PKG_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) -PKG_INSTALL_DIR ?= $(PKG_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 ?= +HOST_JOBS ?= $(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),$(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS))) include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk -STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),))) -STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured -STAMP_BUILT:=$(PKG_BUILD_DIR)/.built -STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed +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 override MAKEFLAGS= include $(INCLUDE_DIR)/download.mk include $(INCLUDE_DIR)/quilt.mk -Build/Patch:=$(Build/Patch/Default) -ifneq ($(strip $(PKG_UNPACK)),) - define Build/Prepare/Default - $(PKG_UNPACK) - $(Build/Patch) - $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used) +Host/Patch:=$(Host/Patch/Default) +ifneq ($(strip $(HOST_UNPACK)),) + define Host/Prepare/Default + $(HOST_UNPACK) + $(Host/Patch) endef endif -define Build/Prepare - $(call Build/Prepare/Default) +define Host/Prepare + $(call Host/Prepare/Default) endef -define Build/Configure/Default - @(cd $(PKG_BUILD_DIR)/$(3); \ - [ -x configure ] && \ - $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_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; \ +HOST_CONFIGURE_VARS = \ + 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 + +HOST_CONFIGURE_CMD = ./configure + +define Host/Configure/Default + (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 -define Build/Configure - $(call Build/Configure/Default) +define Host/Configure + $(call Host/Configure/Default) +endef + +define Host/Compile/Default + $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) $(1) endef -define Build/Compile/Default - $(MAKE) -C $(PKG_BUILD_DIR) $(1) +define Host/Compile + $(call Host/Compile/Default) endef -define Build/Compile - $(call Build/Compile/Default) +define Host/Install/Default + $(_SINGLE)$(MAKE) -C $(HOST_BUILD_DIR) install endef -ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),) - define HostBuild/Autoclean - $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED)) - $(if $(if $(Build/Compile),$(filter prepare,$(MAKECMDGOALS)),1),,$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT))) +define Host/Install + $(call Host/Install/Default) +endef + + +ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),) + define HostHost/Autoclean + $(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 @@ -87,46 +106,73 @@ define Download/default MD5SUM:=$(PKG_MD5SUM) endef -define HostBuild - $(if $(QUILT),$(Build/Quilt)) - $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)) - $(if $(DUMP),,$(call HostBuild/Autoclean)) - - $(STAMP_PREPARED): - @-rm -rf $(PKG_BUILD_DIR) - @mkdir -p $(PKG_BUILD_DIR) - $(call Build/Prepare) +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) + $(call Host/Prepare) touch $$@ - $(STAMP_CONFIGURED): $(STAMP_PREPARED) - $(call Build/Configure) + $(call Host/Exports,$(HOST_STAMP_CONFIGURED)) + $(HOST_STAMP_CONFIGURED): $(HOST_STAMP_PREPARED) + $(call Host/Configure) touch $$@ - $(STAMP_BUILT): $(STAMP_CONFIGURED) - $(call Build/Compile) - touch $$@ + $(call Host/Exports,$(HOST_STAMP_BUILT)) + ifdef Host/Install + host-install: $(if $(STAMP_BUILT),$(HOST_STAMP_BUILT),$(HOST_STAMP_INSTALLED)) + endif - $(STAMP_INSTALLED): $(STAMP_BUILT) - $(call Build/Install) - mkdir -p $$(shell dirname $$@) - touch $$@ - - ifdef Build/Install - install: $(STAMP_INSTALLED) + ifndef STAMP_BUILT + prepare: host-prepare + compile: host-compile + install: host-install + clean: host-clean + update: host-update + + $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) + $(call Host/Compile) + touch $$@ + + $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) + $(call Host/Install) + mkdir -p $$(shell dirname $$@) + touch $$@ + else + $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) + $(call Host/Compile) + $(call Host/Install) + 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 -rf $(HOST_BUILD_DIR) $(HOST_STAMP_INSTALLED) $(HOST_STAMP_BUILT) - package-clean: FORCE - $(call Build/Clean) - $(call Build/Uninstall) - rm -f $(STAMP_INSTALLED) $(STAMP_BUILT) + endef download: - prepare: $(STAMP_PREPARED) - configure: $(STAMP_CONFIGURED) - compile: $(STAMP_BUILT) + prepare: + compile: install: - clean: FORCE - $(call Build/Clean) - rm -rf $(PKG_BUILD_DIR) + clean: + +endif -endef