From 95917dbe67558b1317a2c946dff3dd45ebdbea7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Tue, 18 Jun 2019 15:22:38 +0200 Subject: Display Hex dependency version in the "DEP mydep (version)" line ... exactly as it is displayed for Git-based dependencies. --- core/deps.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/deps.mk b/core/deps.mk index 33177ed..6e463ac 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -47,7 +47,7 @@ $(foreach p,$(DEP_EARLY_PLUGINS),\ dep_name = $(if $(dep_$(1)),$(1),$(if $(pkg_$(1)_name),$(pkg_$(1)_name),$(1))) dep_repo = $(patsubst git://github.com/%,https://github.com/%, \ $(if $(dep_$(1)),$(word 2,$(dep_$(1))),$(pkg_$(1)_repo))) -dep_commit = $(if $(dep_$(1)_commit),$(dep_$(1)_commit),$(if $(dep_$(1)),$(word 3,$(dep_$(1))),$(pkg_$(1)_commit))) +dep_commit = $(if $(dep_$(1)_commit),$(dep_$(1)_commit),$(if $(dep_$(1)),$(if $(filter hex,$(word 1,$(dep_$(1)))),$(word 2,$(dep_$(1))),$(word 3,$(dep_$(1)))),$(pkg_$(1)_commit))) LOCAL_DEPS_DIRS = $(foreach a,$(LOCAL_DEPS),$(if $(wildcard $(APPS_DIR)/$(a)),$(APPS_DIR)/$(a))) ALL_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(foreach dep,$(filter-out $(IGNORE_DEPS),$(BUILD_DEPS) $(DEPS)),$(call dep_name,$(dep)))) -- cgit v1.2.3