From 675fec275739a0d1c67016d6a42b5db6a4db0267 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Mon, 21 Mar 2022 12:24:54 +0100
Subject: [PATCH] Allow for architecture-dependent dependencies
---
configure/E3/CONFIG_EXPORT | 2 +-
require-ess/tools/driver.makefile | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure/E3/CONFIG_EXPORT b/configure/E3/CONFIG_EXPORT
index c3cfd358..159a88ee 100644
--- a/configure/E3/CONFIG_EXPORT
+++ b/configure/E3/CONFIG_EXPORT
@@ -13,7 +13,7 @@ EXPORT_VARS+=E3_SITEMODS_PATH
EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES))
EXPORT_VARS+=QUIET
-EXPORT_VARS+=$(filter %_DEP_VERSION,$(.VARIABLES))
+EXPORT_VARS+=$(foreach v,$(.VARIABLES),$(if $(findstring _DEP_VERSION,$v),$v))
EXPORT_VARS+=$(filter WITH_%,$(.VARIABLES))
EXPORT_VARS+=$(filter %_EXTERNAL,$(.VARIABLES))
diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile
index 18d98f6d..08c12c1a 100644
--- a/require-ess/tools/driver.makefile
+++ b/require-ess/tools/driver.makefile
@@ -445,13 +445,14 @@ INSTALLED_MODULES := $(sort $(notdir $(shell ls -d $(E3_SITEMODS_PATH)/* $(EPICS
define fetch_module_versions
_lm := $$(shell echo $1 | tr '[:upper:]' '[:lower:]')
ifneq ($$(strip $$(filter $(INSTALLED_MODULES),$$(_lm))),)
- $$(_lm)_VERSION := $($1_DEP_VERSION)
+ $$(_lm)_VERSION := $($1_DEP_VERSION$2)
_MODULES += $$(_lm)
else
- $$(warning Invalid dependency "$1_DEP_VERSION"; pruning)
+ $$(warning Invalid dependency "$1_DEP_VERSION$2"; pruning)
endif
endef
$(foreach m,$(patsubst %_DEP_VERSION,%,$(filter %_DEP_VERSION,$(.VARIABLES))),$(eval $(call fetch_module_versions,$m)))
+$(foreach m,$(patsubst %_DEP_VERSION_$(T_A),%,$(filter %_DEP_VERSION_$(T_A),$(.VARIABLES))),$(eval $(call fetch_module_versions,$m,_$(T_A))))
# Fetches the data from .dep files to be parsed by the above
define fetch_deps
--
GitLab