diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-03-08 17:15:45 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-03-08 17:15:45 +0000 |
| commit | b544fd922a04fee54b2a2a9c8739b022e0e95dfb (patch) | |
| tree | c60029720ced8786321862041bb81670343ed694 | |
| parent | f71fa7d646011d9ed8040d816f3aaf8e7d5bfdcf (diff) | |
| download | mtk-20170518-b544fd922a04fee54b2a2a9c8739b022e0e95dfb.zip mtk-20170518-b544fd922a04fee54b2a2a9c8739b022e0e95dfb.tar.gz mtk-20170518-b544fd922a04fee54b2a2a9c8739b022e0e95dfb.tar.bz2 | |
tools: fix stampfile dependency handling when the list of build dirs changes (#15186)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39845
| -rw-r--r-- | include/subdir.mk | 2 | ||||
| -rw-r--r-- | tools/Makefile | 33 |
2 files changed, 19 insertions, 16 deletions
diff --git a/include/subdir.mk b/include/subdir.mk index a2adff2..a08c942 100644 --- a/include/subdir.mk +++ b/include/subdir.mk @@ -57,7 +57,7 @@ endef ifndef DUMP_TARGET_DB # Parameters: <subdir> <name> <target> <depends> <config options> <stampfile location> define stampfile - $(1)/stamp-$(3):=$(if $(6),$(6),$(STAGING_DIR))/stamp/.$(2)_$(3)$(if $(5),_$(call confvar,$(5))) + $(1)/stamp-$(3):=$(if $(6),$(6),$(STAGING_DIR))/stamp/.$(2)_$(3)$(5) $$($(1)/stamp-$(3)): $(TMP_DIR)/.build $(4) @+$(SCRIPT_DIR)/timestamp.pl -n $$($(1)/stamp-$(3)) $(1) $(4) || \ $(MAKE) $(if $(QUIET),--no-print-directory) $$($(1)/flags-$(3)) $(1)/$(3) diff --git a/tools/Makefile b/tools/Makefile index 7fea248..7466b82 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -10,9 +10,20 @@ curdir:=tools # subdirectories to descend into tools-y := + ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN)$(CONFIG_GCC_LLVM),) -tools-y += gmp mpfr mpc libelf + BUILD_TOOLCHAIN := y +endif +ifdef CONFIG_GCC_USE_GRAPHITE + ifeq ($(CONFIG_GCC_USE_SYSTEM_PPL_CLOOG),) + BUILD_PPL_CLOOG = y + endif endif +ifneq ($(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_kmod-b43legacy)$(CONFIG_BRCMSMAC_USE_FW_FROM_WL),) + BUILD_B43_TOOLS = y +endif + +tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf tools-y += m4 libtool autoconf automake flex bison pkg-config sed mklibs tools-y += sstrip ipkg-utils genext2fs e2fsprogs mtd-utils mkimage tools-y += firmware-utils patch-image patch quilt yaffs2 flock padjffs2 @@ -23,20 +34,10 @@ tools-$(CONFIG_powerpc) += upx tools-$(CONFIG_TARGET_x86) += qemu tools-$(CONFIG_TARGET_mxs) += elftosb tools-$(CONFIG_TARGET_brcm2708) += mtools dosfstools -ifneq ($(CONFIG_TARGET_ar71xx),) -tools-y += lzma-old squashfs -endif +tools-$(CONFIG_TARGET_ar71xx) += lzma-old squashfs tools-y += lzma squashfs4 -ifneq ($(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_kmod-b43legacy)$(CONFIG_BRCMSMAC_USE_FW_FROM_WL),) -tools-y += b43-tools -endif - -ifdef CONFIG_GCC_USE_GRAPHITE - ifeq ($(CONFIG_GCC_USE_SYSTEM_PPL_CLOOG),) - tools-y += ppl cloog - $(curdir)/cloog/compile := $(curdir)/ppl/install - endif -endif +tools-$(BUILD_B43_TOOLS) += b43-tools +tools-$(BUILD_PPL_CLOOG) += ppl cloog # builddir dependencies $(curdir)/bison/compile := $(curdir)/flex/install @@ -68,6 +69,7 @@ $(curdir)/libelf/compile := $(curdir)/automake/install $(curdir)/sdcc/compile := $(curdir)/bison/install $(curdir)/b43-tools/compile := $(curdir)/bison/install $(curdir)/padjffs2/compile := $(curdir)/findutils/install +$(curdir)/cloog/compile := $(curdir)/ppl/install ifneq ($(CONFIG_CCACHE),) $(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/install)) @@ -147,5 +149,6 @@ $(curdir)//compile = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($( $(curdir)/ := .config prereq $(curdir)//install = $(1)/compile -$(eval $(call stampfile,$(curdir),tools,install,,CONFIG_CCACHE CONFIG_powerpc CONFIG_GCC_VERSION_4_5 CONFIG_GCC_USE_GRAPHITE CONFIG_TARGET_orion_generic)) +tools_enabled = $(foreach tool,$(sort $(tools-y) $(tools-)),$(if $(filter $(tool),$(tools-y)),y,n)) +$(eval $(call stampfile,$(curdir),tools,install,,_$(subst $(space),,$(tools_enabled)))) $(eval $(call subdir,$(curdir))) |