From fe36f36eb556be1f5e427e01acceb3c94ccd8759 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 5 Mar 2021 15:43:24 +0100 Subject: [PATCH] fix for EPICS 7.0.5: make sure not to remove #include iocshRegisterCommon.h from *_registerRecordDeviceDriver.cpp --- App/tools/driver.makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile index ebcbc51..4838d3c 100644 --- a/App/tools/driver.makefile +++ b/App/tools/driver.makefile @@ -1079,9 +1079,10 @@ endif # EPICS R3.14+: # Create file to fill registry from dbd file. +# Avoid calling iocshRegisterCommon() repeatedly for each module ${REGISTRYFILE}: ${MODULEDBD} $(RM) $@ temp.cpp - $(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl $< $(basename $@) | grep -v iocshRegisterCommon > temp.cpp + $(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl $< $(basename $@) | grep -v 'iocshRegisterCommon.*;' > temp.cpp $(MV) temp.cpp $@ # 3.14.12 complains if this rule is not overwritten