Changeset 14910


Ignore:
Timestamp:
2009-03-17T04:21:52+01:00 (7 years ago)
Author:
nbd
Message:

fix quilt variable and stampfile usage for host builds

Location:
trunk/include
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/host-build.mk

    r14906 r14910  
    1414 
    1515BUILD_TYPES += host 
    16 HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),))) 
     16HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),))) 
    1717HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured 
    1818HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built 
     
    7979endef 
    8080 
    81 ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),) 
     81ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),) 
    8282  define HostHost/Autoclean 
    8383    $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(HOST_STAMP_PREPARED)) 
     
    9797ifndef DUMP 
    9898  define HostBuild 
    99   $(if $(QUILT),$(Host/Quilt)) 
     99  $(if $(HOST_QUILT),$(Host/Quilt)) 
    100100  $(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))) 
    101101  $(if $(DUMP),,$(call HostHost/Autoclean)) 
     
    129129    install: host-install 
    130130    clean: host-clean 
     131  else 
     132    host-compile: $(HOST_STAMP_INSTALLED) 
    131133  endif 
    132134  host-prepare: $(HOST_STAMP_PREPARED) 
  • trunk/include/quilt.mk

    r14905 r14910  
    5656endef 
    5757 
     58define HostPatchDir 
     59$(call PatchDir/$(if $(strip $(HOST_QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)),$(strip $(3))) 
     60endef 
     61 
    5862ifneq ($(PKG_BUILD_DIR),) 
    5963  QUILT?=$(if $(wildcard $(PKG_BUILD_DIR)/.quilt_used),y) 
     
    7983 
    8084define Host/Patch/Default 
    81         $(if $(QUILT),rm -rf $(HOST_BUILD_DIR)/patches; mkdir -p $(HOST_BUILD_DIR)/patches) 
    82         $(call PatchDir,$(HOST_BUILD_DIR),$(HOST_PATCH_DIR),) 
    83         $(if $(QUILT),touch $(HOST_BUILD_DIR)/.quilt_used) 
     85        $(if $(HOST_QUILT),rm -rf $(HOST_BUILD_DIR)/patches; mkdir -p $(HOST_BUILD_DIR)/patches) 
     86        $(call HostPatchDir,$(HOST_BUILD_DIR),$(HOST_PATCH_DIR),) 
     87        $(if $(HOST_QUILT),touch $(HOST_BUILD_DIR)/.quilt_used) 
    8488endef 
    8589 
Note: See TracChangeset for help on using the changeset viewer.