summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2017-10-06 06:07:18 (GMT)
committerTony Theodore <tonyt@logyst.com>2017-10-09 04:19:53 (GMT)
commit3e6d76dec6f50b616e42733b3fba4e262c037234 (patch)
tree6bc8cd8163a8188887c18ca6446ede5124bd25dd /Makefile
parent75fd635f6ce66f874ebd4bed349e5bd0208cbeda (diff)
downloadmxe-3e6d76dec6f50b616e42733b3fba4e262c037234.zip
mxe-3e6d76dec6f50b616e42733b3fba4e262c037234.tar.gz
mxe-3e6d76dec6f50b616e42733b3fba4e262c037234.tar.bz2
Makefile: always eval $(PKG)_PATCHES as a variable
Allows plugin packages to re-use the variable (eg. gcc7 and gcc-host) and keep this metadata in sync (same as *_VERSION, *_FILE, etc.)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 28b6806..4b365cf 100644
--- a/Makefile
+++ b/Makefile
@@ -247,7 +247,7 @@ define PREPARE_PKG_SOURCE
$(else),\
cd '$(2)' && $(call UNPACK_PKG_ARCHIVE,$(1))
cd '$(2)/$($(1)_SUBDIR)'
- $(foreach PKG_PATCH,$(PKG_PATCHES),
+ $(foreach PKG_PATCH,$($(1)_PATCHES),
(cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
)
endef
@@ -491,6 +491,7 @@ $(foreach TARGET,$(MXE_TARGETS),$(call TARGET_RULE,$(TARGET)))
define PKG_RULE
# configure GitHub metadata if GH_CONF is set
$(if $($(PKG)_GH_CONF),$(eval $(MXE_SETUP_GITHUB)))
+$(eval $(PKG)_PATCHES := $(PKG_PATCHES))
.PHONY: download-$(1)
download-$(1): $(addprefix download-,$($(1)_DEPS)) download-only-$(1)
@@ -554,7 +555,7 @@ define PKG_TARGET_RULE
.PHONY: $(1)
$(1): $(PREFIX)/$(3)/installed/$(1)
$(PREFIX)/$(3)/installed/$(1): $(PKG_MAKEFILES) \
- $(PKG_PATCHES) \
+ $($(PKG)_PATCHES) \
$(PKG_TESTFILES) \
$($(1)_FILE_DEPS) \
$(addprefix $(PREFIX)/$(3)/installed/,$(value $(call LOOKUP_PKG_RULE,$(1),DEPS,$(3)))) \