KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix quilt variable and stampfile usage for host builds

Browse source 
SVN-Revision: 14910
This commit is contained in:
Felix Fietkau 2009-03-17 03:21:52 +00:00
parent 510bdd3f0e
commit 9b96b24e32
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/host-build.mk
View file

@ -13,7 +13,7 @@ include $(INCLUDE_DIR)/unpack.mk
include $(INCLUDE_DIR)/depends.mk include $(INCLUDE_DIR)/depends.mk
BUILD_TYPES += host BUILD_TYPES += host
HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(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_DEPEND),)))
HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured
HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed
@ -78,7 +78,7 @@ define Host/Compile
$(call Host/Compile/Default) $(call Host/Compile/Default)
endef endef
ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),) ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),)
define HostHost/Autoclean define HostHost/Autoclean
$(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(HOST_STAMP_PREPARED)) $(call rdep,${CURDIR} $(PKG_FILE_DEPEND),$(HOST_STAMP_PREPARED))
$(if $(if $(Host/Compile),$(filter prepare,$(MAKECMDGOALS)),1),,$(call rdep,$(HOST_BUILD_DIR),$(HOST_STAMP_BUILT))) $(if $(if $(Host/Compile),$(filter prepare,$(MAKECMDGOALS)),1),,$(call rdep,$(HOST_BUILD_DIR),$(HOST_STAMP_BUILT)))
@ -96,7 +96,7 @@ endef
ifndef DUMP ifndef DUMP
define HostBuild define HostBuild
$(if $(QUILT),$(Host/Quilt)) $(if $(HOST_QUILT),$(Host/Quilt))
$(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))) $(if $(if $(PKG_HOST_ONLY),,$(STAMP_PREPARED)),,$(if $(strip $(PKG_SOURCE_URL)),$(call Download,default)))
$(if $(DUMP),,$(call HostHost/Autoclean)) $(if $(DUMP),,$(call HostHost/Autoclean))
@ -128,6 +128,8 @@ ifndef DUMP
compile: host-compile compile: host-compile
install: host-install install: host-install
clean: host-clean clean: host-clean
else
host-compile: $(HOST_STAMP_INSTALLED)
endif endif
host-prepare: $(HOST_STAMP_PREPARED) host-prepare: $(HOST_STAMP_PREPARED)
host-configure: $(HOST_STAMP_CONFIGURED) host-configure: $(HOST_STAMP_CONFIGURED)

10
include/quilt.mk
View file

@ -55,6 +55,10 @@ define PatchDir
$(call PatchDir/$(if $(strip $(QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)),$(strip $(3))) $(call PatchDir/$(if $(strip $(QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)),$(strip $(3)))
endef endef
define HostPatchDir
$(call PatchDir/$(if $(strip $(HOST_QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)),$(strip $(3)))
endef
ifneq ($(PKG_BUILD_DIR),) ifneq ($(PKG_BUILD_DIR),)
QUILT?=$(if $(wildcard $(PKG_BUILD_DIR)/.quilt_used),y) QUILT?=$(if $(wildcard $(PKG_BUILD_DIR)/.quilt_used),y)
ifneq ($(QUILT),) ifneq ($(QUILT),)
@ -78,9 +82,9 @@ ifneq ($(HOST_BUILD_DIR),)
endif endif
define Host/Patch/Default define Host/Patch/Default
$(if $(QUILT),rm -rf $(HOST_BUILD_DIR)/patches; mkdir -p $(HOST_BUILD_DIR)/patches) $(if $(HOST_QUILT),rm -rf $(HOST_BUILD_DIR)/patches; mkdir -p $(HOST_BUILD_DIR)/patches)
$(call PatchDir,$(HOST_BUILD_DIR),$(HOST_PATCH_DIR),) $(call HostPatchDir,$(HOST_BUILD_DIR),$(HOST_PATCH_DIR),)
$(if $(QUILT),touch $(HOST_BUILD_DIR)/.quilt_used) $(if $(HOST_QUILT),touch $(HOST_BUILD_DIR)/.quilt_used)
endef endef
define Build/Patch/Default define Build/Patch/Default