From a3e3f882ac66231b18ccd8a694439c9c22555c5b Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Wed, 24 Oct 2018 16:31:25 +0200
Subject: [PATCH] only use versions of other modules which exist for the
current T_A
---
App/tools/driver.makefile | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile
index bf4abcff..163cc94e 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -431,8 +431,15 @@ install build debug::
umask 002; echo MAKING ARCH $$ARCH; ${MAKE} -f ${USERMAKEFILE} T_A=$$ARCH $@; \
done
+else # T_A
+
+ifeq ($(filter O.%,$(notdir ${CURDIR})),)
+## RUN 3
+# Target architecture defined.
+# Still in source directory, third run.
+
# Add include directory of other modules to include file search path.
-# Default is to use latest version of any module.
+# Default is to use latest version of any module for this EPICSVERSION and T_A.
# The user can overwrite the version by defining <module>_VERSION=<version>.
# For each other module look for include/ for the EPICS base version in use.
# The user can overwrite (or add) by defining <module>_INC=<relative/path> (not recommended!).
@@ -442,7 +449,7 @@ install build debug::
# Only accept numerical versions (needs extended glob).
# This is slow, thus do it only once for each EPICSVERSION.
define ADD_OTHER_MODULE_INCLUDES
-$(eval $(1)_VERSION := $(patsubst ${EPICS_MODULES}/$(1)/%/R${EPICSVERSION}/include,%,$(firstword $(shell ls -dvr ${EPICS_MODULES}/$(1)/+([0-9]).+([0-9]).+([0-9])/R${EPICSVERSION}/include 2>/dev/null))))
+$(eval $(1)_VERSION := $(patsubst ${EPICS_MODULES}/$(1)/%/R${EPICSVERSION}/lib/$(T_A)/../../include,%,$(firstword $(shell ls -dvr ${EPICS_MODULES}/$(1)/+([0-9]).+([0-9]).+([0-9])/R${EPICSVERSION}/lib/$(T_A)/../../include 2>/dev/null))))
export $(1)_VERSION
OTHER_MODULE_INCLUDES += $$(patsubst %,-I${EPICS_MODULES}/$(1)/%/R${EPICSVERSION}/include,$$($(1)_VERSION))
endef
@@ -451,13 +458,6 @@ $(eval $(foreach m,$(filter-out $(PRJ) $(IGNORE_MODULES),$(notdir $(wildcard ${E
OTHER_MODULE_INCLUDES += $(addprefix -I,$(wildcard ${INSTBASE}/iocBoot/R${EPICSVERSION}/include))
export OTHER_MODULE_INCLUDES
-else # T_A
-
-ifeq ($(filter O.%,$(notdir ${CURDIR})),)
-## RUN 3
-# Target architecture defined.
-# Still in source directory, third run.
-
ifeq ($(filter ${OS_CLASS},${OS_CLASS_LIST}),)
install% build%: build
--
GitLab