aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/Makefile.package.in2
-rw-r--r--toolchain/dependencies/dependencies.mk8
2 files changed, 3 insertions, 7 deletions
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 2349b05af8..e85eb15490 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -726,6 +726,8 @@ else ifeq ($$($(2)_SITE_METHOD),hg)
DL_TOOLS_DEPENDENCIES += hg
endif # SITE_METHOD
+DL_TOOLS_DEPENDENCIES += $(firstword $(INFLATE$(suffix $($(2)_SOURCE))))
+
endif # $(2)_KCONFIG_VAR
endef # GENTARGETS_INNER
diff --git a/toolchain/dependencies/dependencies.mk b/toolchain/dependencies/dependencies.mk
index 24d66663bb..ea8bf252bd 100644
--- a/toolchain/dependencies/dependencies.mk
+++ b/toolchain/dependencies/dependencies.mk
@@ -10,16 +10,10 @@ ifeq ($(BR2_STRIP_sstrip),y)
DEPENDENCIES_HOST_PREREQ+=host-sstrip
endif
-# Remove duplicate entries from $(DL_TOOLS_DEPENDENCIES)
-DL_TOOLS = \
- $(findstring svn,$(DL_TOOLS_DEPENDENCIES)) \
- $(findstring git,$(DL_TOOLS_DEPENDENCIES)) \
- $(findstring bzr,$(DL_TOOLS_DEPENDENCIES))
-
core-dependencies:
@HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \
CONFIG_FILE="$(CONFIG_DIR)/.config" \
- DL_TOOLS="$(DL_TOOLS)" \
+ DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \
$(TOPDIR)/toolchain/dependencies/dependencies.sh
dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ)