move timeout trigger for protection mode to node timeout trigger

[openwrt.git] / include / host-build.mk

diff --git a/include/host-build.mk b/include/host-build.mk
index b5c2a22..8a8d6de 100644 (file)
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -1,18 +1,25 @@
 # 
 # 

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2007 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 #
 # 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
+

 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 include $(INCLUDE_DIR)/depends.mk
 
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
 include $(INCLUDE_DIR)/depends.mk
 

-STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared_$(shell find ${CURDIR} $(PKG_FILE_DEPEND) $(DEP_FINDPARAMS) | md5s)
+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_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built

+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)
 include $(INCLUDE_DIR)/quilt.mk
 
 Build/Patch:=$(Build/Patch/Default)


@@ -20,6 +27,7 @@ ifneq ($(strip $(PKG_UNPACK)),)
   define Build/Prepare/Default
        $(PKG_UNPACK)
        $(Build/Patch)
   define Build/Prepare/Default
        $(PKG_UNPACK)
        $(Build/Patch)

+       $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)

   endef
 endif
 
   endef
 endif
 


@@ -30,25 +38,21 @@ endef
 define Build/Configure/Default
        @(cd $(PKG_BUILD_DIR)/$(3); \
        [ -x configure ] && \
 define Build/Configure/Default
        @(cd $(PKG_BUILD_DIR)/$(3); \
        [ -x configure ] && \

+               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/$(3)/ && \

                $(2) \
                $(2) \

-               CPPFLAGS="-I$(STAGING_DIR)/host/include" \
-               LDFLAGS="-L$(STAGING_DIR)/host/lib" \
+               CPPFLAGS="$(HOST_CFLAGS)" \
+               LDFLAGS="$(HOST_LDFLAGS)" \
+               SHELL="$(BASH)" \

                ./configure \
                ./configure \

-               --target=$(GNU_TARGET_NAME) \
-               --host=$(GNU_TARGET_NAME) \
+               --target=$(GNU_HOST_NAME) \
+               --host=$(GNU_HOST_NAME) \

                --build=$(GNU_HOST_NAME) \
                --program-prefix="" \
                --program-suffix="" \
                --build=$(GNU_HOST_NAME) \
                --program-prefix="" \
                --program-suffix="" \

-               --prefix=/usr \
-               --exec-prefix=/usr \
-               --bindir=/usr/bin \
-               --sbindir=/usr/sbin \
-               --libexecdir=/usr/lib \
-               --sysconfdir=/etc \
-               --datadir=/usr/share \
-               --localstatedir=/var \
-               --mandir=/usr/man \
-               --infodir=/usr/info \
+               --prefix=$(STAGING_DIR_HOST) \
+               --exec-prefix=$(STAGING_DIR_HOST) \
+               --sysconfdir=$(STAGING_DIR_HOST)/etc \
+               --localstatedir=$(STAGING_DIR_HOST)/var \

                $(DISABLE_NLS) \
                $(1); \
                true; \
                $(DISABLE_NLS) \
                $(1); \
                true; \


@@ -67,29 +71,25 @@ define Build/Compile
   $(call Build/Compile/Default)
 endef
 
   $(call Build/Compile/Default)
 endef
 

-               
-ifneq ($(strip $(PKG_SOURCE)),)
-  download: $(DL_DIR)/$(PKG_SOURCE)
-
-  $(DL_DIR)/$(PKG_SOURCE):
-       mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
-
-  $(STAMP_PREPARED): $(DL_DIR)/$(PKG_SOURCE)
-endif
-
-ifneq ($(CONFIG_AUTOREBUILD),)
+ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)

   define HostBuild/Autoclean
   define HostBuild/Autoclean

-    $(PKG_BUILD_DIR)/.dep_files: $(STAMP_PREPARED)

     $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED))
     $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(STAMP_PREPARED))

-    $(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT),$(PKG_BUILD_DIR)/.dep_files, -and -not -path "/.*" -and -not -path "*/ipkg*")
+    $(if $(if $(Build/Compile),$(filter prepare,$(MAKECMDGOALS)),1),,$(call rdep,$(PKG_BUILD_DIR),$(STAMP_BUILT)))

   endef
 endif
 
   endef
 endif
 

+define Download/default
+  FILE:=$(PKG_SOURCE)
+  URL:=$(PKG_SOURCE_URL)
+  PROTO:=$(PKG_SOURCE_PROTO)
+  VERSION:=$(PKG_SOURCE_VERSION)
+  MD5SUM:=$(PKG_MD5SUM)
+endef
+

 define HostBuild
 define HostBuild

-  ifeq ($(DUMP),)
-    $(call HostBuild/Autoclean)
-  endif
+  $(if $(QUILT),$(Build/Quilt))
+  $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))
+  $(if $(DUMP),,$(call HostBuild/Autoclean))

   
   $(STAMP_PREPARED):
        @-rm -rf $(PKG_BUILD_DIR)
   
   $(STAMP_PREPARED):
        @-rm -rf $(PKG_BUILD_DIR)


@@ -103,22 +103,21 @@ define HostBuild
 
   $(STAMP_BUILT): $(STAMP_CONFIGURED)
        $(call Build/Compile)
 
   $(STAMP_BUILT): $(STAMP_CONFIGURED)
        $(call Build/Compile)

-       @$(NO_TRACE_MAKE) $(PKG_BUILD_DIR)/.dep_files

        touch $$@
 
        touch $$@
 

-  $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(STAMP_BUILT)
+  $(STAMP_INSTALLED): $(STAMP_BUILT)

        $(call Build/Install)
        mkdir -p $$(shell dirname $$@)
        touch $$@
        
   ifdef Build/Install
        $(call Build/Install)
        mkdir -p $$(shell dirname $$@)
        touch $$@
        
   ifdef Build/Install

-    install: $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed
+    install: $(STAMP_INSTALLED)

   endif
 
   package-clean: FORCE
        $(call Build/Clean)
        $(call Build/Uninstall)
   endif
 
   package-clean: FORCE
        $(call Build/Clean)
        $(call Build/Uninstall)

-       rm -f $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed
+       rm -f $(STAMP_INSTALLED) $(STAMP_BUILT)

 
   download:
   prepare: $(STAMP_PREPARED)
 
   download:
   prepare: $(STAMP_PREPARED)