Skip to content
Snippets Groups Projects
Commit fb082b35 authored by Simon Rose's avatar Simon Rose
Browse files

Added some indentation for clarity

parent 2a49f1ea
No related branches found
No related tags found
1 merge request!83E3-752: Fetch dependencies recursively
Pipeline #109653 passed
...@@ -442,9 +442,9 @@ REQUIRED := ...@@ -442,9 +442,9 @@ REQUIRED :=
# Converts all of the X_DEP_VERSIONs to x_VERSION and records them # Converts all of the X_DEP_VERSIONs to x_VERSION and records them
define fetch_module_versions define fetch_module_versions
_lm := $$(shell echo $1 | tr '[:upper:]' '[:lower:]') _lm := $$(shell echo $1 | tr '[:upper:]' '[:lower:]')
$$(_lm)_VERSION := $($1_DEP_VERSION) $$(_lm)_VERSION := $($1_DEP_VERSION)
_MODULES += $$(_lm) _MODULES += $$(_lm)
endef endef
$(foreach m,$(patsubst %_DEP_VERSION,%,$(filter %_DEP_VERSION,$(.VARIABLES))),$(eval $(call fetch_module_versions,$m))) $(foreach m,$(patsubst %_DEP_VERSION,%,$(filter %_DEP_VERSION,$(.VARIABLES))),$(eval $(call fetch_module_versions,$m)))
...@@ -458,12 +458,12 @@ endef ...@@ -458,12 +458,12 @@ endef
# Used to recurse through versions: updates REQUIRED and fetches all of the dependencies from the given module # Used to recurse through versions: updates REQUIRED and fetches all of the dependencies from the given module
define update_dep_versions define update_dep_versions
m := $$(firstword $$(_MODULES)) m := $$(firstword $$(_MODULES))
REQUIRED += $$m REQUIRED += $$m
$$m_TBL := $$(call fetch_deps,$$m) $$m_TBL := $$(call fetch_deps,$$m)
$$m_DEPS := $$(call select,1,$$($$m_TBL),1) $$m_DEPS := $$(call select,1,$$($$m_TBL),1)
_MODULES := $$(filter-out $$(REQUIRED),$$(_MODULES) $$($$m_DEPS)) _MODULES := $$(filter-out $$(REQUIRED),$$(_MODULES) $$($$m_DEPS))
$$(foreach mm,$$($$m_DEPS),$$(eval $$(mm)_VERSION := $$(call select,2,$$($$m_TBL),$$$$(call str-eq,$$$$1,$$(mm))))) $$(foreach mm,$$($$m_DEPS),$$(eval $$(mm)_VERSION := $$(call select,2,$$($$m_TBL),$$$$(call str-eq,$$$$1,$$(mm)))))
endef endef
$(call while,$$(_MODULES),$(update_dep_versions)) $(call while,$$(_MODULES),$(update_dep_versions))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment