diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-03-17 03:21:52 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-03-17 03:21:52 +0000 |
| commit | 0a5976b604f9cc8c81dfdbc7dc4ecb068345c3b9 (patch) | |
| tree | 53bead96f9d9fbb1b69984e0825e658fbb86c4a0 /include | |
| parent | 2f5a8c4214e03ee0bb0447e693f7ef67d42a52de (diff) | |
| download | upstream-0a5976b604f9cc8c81dfdbc7dc4ecb068345c3b9.tar.gz upstream-0a5976b604f9cc8c81dfdbc7dc4ecb068345c3b9.tar.bz2 upstream-0a5976b604f9cc8c81dfdbc7dc4ecb068345c3b9.zip | |
fix quilt variable and stampfile usage for host builds
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14910 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/host-build.mk | 8 | ||||
| -rw-r--r-- | include/quilt.mk | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index a6118fb06f..3d1983b28f 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -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 $(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_BUILT:=$(HOST_BUILD_DIR)/.built HOST_STAMP_INSTALLED:=$(STAGING_DIR_HOST)/stamp/.$(PKG_NAME)_installed @@ -78,7 +78,7 @@ define Host/Compile $(call Host/Compile/Default) endef -ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),) +ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),) define HostHost/Autoclean $(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))) @@ -96,7 +96,7 @@ endef ifndef DUMP 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 $(DUMP),,$(call HostHost/Autoclean)) @@ -128,6 +128,8 @@ ifndef DUMP compile: host-compile install: host-install clean: host-clean + else + host-compile: $(HOST_STAMP_INSTALLED) endif host-prepare: $(HOST_STAMP_PREPARED) host-configure: $(HOST_STAMP_CONFIGURED) diff --git a/include/quilt.mk b/include/quilt.mk index fbb3e01e35..32a62fb0df 100644 --- a/include/quilt.mk +++ b/include/quilt.mk @@ -55,6 +55,10 @@ define PatchDir $(call PatchDir/$(if $(strip $(QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)),$(strip $(3))) endef +define HostPatchDir +$(call PatchDir/$(if $(strip $(HOST_QUILT)),Quilt,Default),$(strip $(1)),$(strip $(2)),$(strip $(3))) +endef + ifneq ($(PKG_BUILD_DIR),) QUILT?=$(if $(wildcard $(PKG_BUILD_DIR)/.quilt_used),y) ifneq ($(QUILT),) @@ -78,9 +82,9 @@ ifneq ($(HOST_BUILD_DIR),) endif define Host/Patch/Default - $(if $(QUILT),rm -rf $(HOST_BUILD_DIR)/patches; mkdir -p $(HOST_BUILD_DIR)/patches) - $(call PatchDir,$(HOST_BUILD_DIR),$(HOST_PATCH_DIR),) - $(if $(QUILT),touch $(HOST_BUILD_DIR)/.quilt_used) + $(if $(HOST_QUILT),rm -rf $(HOST_BUILD_DIR)/patches; mkdir -p $(HOST_BUILD_DIR)/patches) + $(call HostPatchDir,$(HOST_BUILD_DIR),$(HOST_PATCH_DIR),) + $(if $(HOST_QUILT),touch $(HOST_BUILD_DIR)/.quilt_used) endef define Build/Patch/Default |