From 96d72268a3a1cfddcbd71353881e8bfadc17db5e Mon Sep 17 00:00:00 2001 From: John Hodge Date: Mon, 17 Jun 2013 19:16:17 +0800 Subject: [PATCH] Externals/common.mk - Fixed depenency issues --- Externals/common.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Externals/common.mk b/Externals/common.mk index 42386e5a..3264a19d 100644 --- a/Externals/common.mk +++ b/Externals/common.mk @@ -81,21 +81,28 @@ $(DIR): $(ARCHIVE) $(DIR)/%: patches/%.patch @echo [PATCH] $@ + @tar -xf $(ARCHIVE) $@ @patch $@ $< $(DIR)/%: patches/% @echo [CP] $@ + @mkdir -p $(dir $@) @cp $< $@ -_patch: $(DIR) $(addprefix $(DIR)/,$(PATCHES)) +PATCHED_FILES := $(addprefix $(DIR)/,$(PATCHES)) +_patch: $(DIR) $(PATCHED_FILES) -_autoreconf: _patch +CONFIGSCRIPT := $(BDIR)/$(firstword $(CONFIGURE_LINE)) +PATCHED_ACFILES := $(filter %/configure.in %/config.sub, $(PATCHED_FILES)) +$(warning $(CONFIGSCRIPT): $(PATCHED_ACFILES)) + +$(CONFIGSCRIPT): $(PATCHED_ACFILES) ifeq ($(AUTORECONF),) else cd $(DIR) && autoreconf --force --install endif -$(BDIR)/Makefile: _autoreconf ../common.mk Makefile +$(BDIR)/Makefile: _patch $(CONFIGSCRIPT) ../common.mk Makefile mkdir -p $(BDIR) cd $(BDIR) && $(CONFIGURE_LINE) -- 2.20.1