X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=include%2Fhost-build.mk;h=75792579eb04f8cfcff430e0b30ea7dd580da107;hp=3d1983b28f37091d51e342f636bf7c1154831c4f;hb=04e1ae285975100bf86d917f9e1c078055345937;hpb=930e65e6e29f945d411efc3e4a5b57e0bf9b4522 diff --git a/include/host-build.mk b/include/host-build.mk index 3d1983b28..75792579e 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. @@ -13,7 +13,7 @@ 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 @@ -36,6 +36,7 @@ define Host/Prepare endef HOST_CONFIGURE_VARS = \ + CFLAGS="$(HOST_CFLAGS)" \ CPPFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ SHELL="$(BASH)" @@ -54,7 +55,7 @@ HOST_CONFIGURE_ARGS = \ HOST_CONFIGURE_CMD = ./configure define Host/Configure/Default - @(cd $(HOST_BUILD_DIR)/$(3); \ + (cd $(HOST_BUILD_DIR)/$(3); \ if [ -x configure ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \ $(2) \ @@ -78,9 +79,18 @@ define Host/Compile $(call Host/Compile/Default) endef +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 @@ -94,6 +104,14 @@ define Download/default MD5SUM:=$(PKG_MD5SUM) endef +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)) @@ -106,21 +124,14 @@ ifndef DUMP $(call Host/Prepare) touch $$@ + $(call Host/Exports,$(HOST_STAMP_CONFIGURED)) $(HOST_STAMP_CONFIGURED): $(HOST_STAMP_PREPARED) $(call Host/Configure) 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 - host-install: $(HOST_STAMP_INSTALLED) + host-install: $(if $(STAMP_BUILT),$(HOST_STAMP_BUILT),$(HOST_STAMP_INSTALLED)) endif ifndef STAMP_BUILT @@ -128,8 +139,21 @@ ifndef DUMP 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-compile: $(HOST_STAMP_INSTALLED) + $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) + $(call Host/Compile) + $(call Host/Install) + touch $$@ endif host-prepare: $(HOST_STAMP_PREPARED) host-configure: $(HOST_STAMP_CONFIGURED)