2014-05-18 19:04:48 +00:00
|
|
|
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
|
|
|
Date: Wed, 7 May 2014 22:57:10 +0200
|
|
|
|
|
Subject: tools/Makefile: fix host tools build dependencies
|
|
|
|
|
|
|
|
|
|
diff --git a/tools/Makefile b/tools/Makefile
|
2014-07-04 06:28:21 +00:00
|
|
|
index 6658f8c..26a3fb1 100644
|
2014-05-18 19:04:48 +00:00
|
|
|
--- a/tools/Makefile
|
|
|
|
|
+++ b/tools/Makefile
|
2014-07-04 06:28:21 +00:00
|
|
|
@@ -75,6 +75,7 @@ endif
|
2014-05-18 19:04:48 +00:00
|
|
|
$(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-)
|
|
|
|
|
$(curdir)/builddirs-default := $(tools-y)
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
ifndef DUMP_TARGET_DB
|
|
|
|
|
define PrepareStaging
|
|
|
|
|
@for dir in $(1); do ( \
|
2014-07-04 06:28:21 +00:00
|
|
|
@@ -86,10 +87,16 @@ define PrepareStaging
|
2014-05-18 19:04:48 +00:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
# preparatory work
|
|
|
|
|
+ifneq ($(ARCH),)
|
|
|
|
|
+staging_prepared = $(STAGING_DIR)/.prepared
|
|
|
|
|
+
|
|
|
|
|
$(STAGING_DIR)/.prepared: $(TMP_DIR)/.build
|
|
|
|
|
$(call PrepareStaging,$(STAGING_DIR))
|
|
|
|
|
mkdir -p $(BUILD_DIR)/stamp
|
|
|
|
|
touch $@
|
|
|
|
|
+else
|
|
|
|
|
+staging_prepared :=
|
|
|
|
|
+endif
|
|
|
|
|
|
|
|
|
|
$(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
|
|
|
|
|
$(call PrepareStaging,$(STAGING_DIR_HOST))
|
2014-07-04 06:28:21 +00:00
|
|
|
@@ -101,7 +108,7 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
|
2014-05-18 19:04:48 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
define PrepareCommand
|
|
|
|
|
-$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
|
|
|
|
|
+$(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR_HOST)/.prepared
|
|
|
|
|
@mkdir -p "$$(dir $$@)"; rm -f "$$@"
|
|
|
|
|
@export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \
|
|
|
|
|
echo "Command $(1) not found."; false; \
|
2014-07-04 06:28:21 +00:00
|
|
|
@@ -110,7 +117,7 @@ $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared
|
2014-05-18 19:04:48 +00:00
|
|
|
endef
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
-$(STAGING_DIR_HOST)/bin/stat: $(STAGING_DIR)/.prepared
|
|
|
|
|
+$(STAGING_DIR_HOST)/bin/stat: $(STAGING_DIR_HOST)/.prepared
|
|
|
|
|
@rm -f $@
|
|
|
|
|
@if stat --version > /dev/null 2>&1; then \
|
|
|
|
|
ln -s `which stat` $@; \
|
2014-07-04 06:28:21 +00:00
|
|
|
@@ -128,8 +135,8 @@ $(eval $(call PrepareCommand,seq,gseq seq))
|
2014-05-18 19:04:48 +00:00
|
|
|
$(eval $(call PrepareCommand,python,python2 python))
|
|
|
|
|
|
|
|
|
|
$(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum cp stat seq python)
|
|
|
|
|
-$(curdir)//prepare = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps)
|
|
|
|
|
-$(curdir)//compile = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps)
|
|
|
|
|
+$(curdir)//prepare = $(staging_prepared) $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps)
|
|
|
|
|
+$(curdir)//compile = $(staging_prepared) $(STAGING_DIR_HOST)/.prepared $($(curdir)/cmddeps)
|
|
|
|
|
|
|
|
|
|
# prerequisites for the individual targets
|
|
|
|
|
$(curdir)/ := .config prereq
|
