Merge ~dirk.zimoch/epics-base:vxWorks5 into ~epics-core/epics-base/+git/epics-base:core/master

[Dirk Zimoch]

This change brings back the possibility to compile EPICS 7 for vxWorks 5 (actually up to 6.3).
It implements a mechanism to disable certain modules for specific target architecture using the Makefile variable SKIP_BUILDS with a pattern list of modules to skip. The variable can be set individually for each target architecture.

This change sets 'SKIP_BUILDS=pv% normativeTypes' for vxWorks targets with a gcc version lower than 3.4, that is vxWorks versions up to 6.3.

[Ralph Lange (ralph-lange)]

core/master is dead since we re-united the base modules into a single branch.
7.0 is the default branch ever since.

review: Disapprove

[Ralph Lange (ralph-lange)]

Oops, I thought this was the same as your other merge proposal.
Please resubmit with 7.0 as target branch.

review: Needs Resubmitting

Unmerged commits

2f95169... by Dirk Zimoch on 2018-09-21

re-enable building vxWorks 5

3aa6c05... by Dirk Zimoch on 2018-09-21

Add mechanism to skip modules for selected architectures

diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 9b8cbf0..daaae86 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -84,6 +84,23 @@ endif
 -include $(CONFIG)/RULES.Db
 
 #---------------------------------------------------------------
+# Do not build anything if current path matches SKIP_BUILD
+
+ifneq (,$(strip $(SKIP_BUILDS)))
+CURRENT_MODULE=$(subst $(realpath $(TOP)/..)/,,$(subst $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)/,,$(realpath ..)))
+ifneq ($(filter $(SKIP_BUILDS) $(addsuffix /%,$(SKIP_BUILDS)),$(CURRENT_MODULE)),)
+$(info Skipping $(CURRENT_MODULE) for $(T_A))
+PROD=
+TESTPROD=
+LIBRARY=
+TESTLIBRARY=
+LOADABLE_LIBRARY=
+TESTS=
+SRC_FILES=
+endif
+endif
+
+#---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
 
 #ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) ))
diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon
index 50f6269..2a13656 100644
--- a/configure/os/CONFIG.Common.vxWorksCommon
+++ b/configure/os/CONFIG.Common.vxWorksCommon
@@ -63,6 +63,7 @@ VXWORKS_MAJOR_VERSION = $(basename $(basename $(VXWORKS_VERSION)))
 
 # These are needed for vxWorks 6.x; the GNU toolset version number
 # is in the path to the compiler tools:
+VX_GNU_VERSION_5   = 2.96
 VX_GNU_VERSION_6.0 = 3.3.2
 VX_GNU_VERSION_6.1 = 3.3.2
 VX_GNU_VERSION_6.2 = 3.3.2
@@ -73,9 +74,17 @@ VX_GNU_VERSION_6.6 = 4.1.2
 VX_GNU_VERSION_6.7 = 4.1.2
 VX_GNU_VERSION_6.8 = 4.1.2
 VX_GNU_VERSION_6.9 = 4.3.3
-VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
 
 VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
+VX_GNU_MINOR_VERSION = $(basename $(patsubst $(VX_GNU_MAJOR_VERSION).%,%,$(VX_GNU_VERSION)))
+
+# gcc version before 3.4 are "old" and need special treatment
+VX_OLD_GCC_2   = OLD
+VX_OLD_GCC_3.3 = OLD
+VX_OLD_GCC_3   = $(VX_OLD_GCC_3.$(VX_GNU_MINOR_VERSION))
+VX_OLD_GCC = $(VX_OLD_GCC_$(VX_GNU_MAJOR_VERSION))
 
 #--------------------------------------------------
 # Fix old Linux WIND_HOST_TYPE
@@ -85,14 +94,20 @@ endif
 
 #--------------------------------------------------
 # vxWorks directory definitions
-VX_DIR = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR_5 = $(WIND_BASE)
+VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
 
-GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
+VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
+GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # vxWorks GNU directories
 
-GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
+GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # This finds nm on any supported VxWorks version
@@ -133,12 +148,18 @@ OPT_CXXFLAGS_YES = -O2
 # code flags
 CODE_CFLAGS =
 #
-# For vxWorks versions before 6.3 we need this g++ compiler flag
-CODE_CXXFLAGS_6.0 = -fno-implicit-templates
-CODE_CXXFLAGS_6.1 = -fno-implicit-templates
-CODE_CXXFLAGS_6.2 = -fno-implicit-templates
-CODE_CXXFLAGS_6 = $(CODE_CXXFLAGS_$(VXWORKS_VERSION))
-CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VXWORKS_MAJOR_VERSION))
+# For gcc versions before 3.4 we need this g++ compiler flag
+CODE_CXXFLAGS_OLD = -fno-implicit-templates
+CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VX_OLD_GCC))
+
+#--------------------------------------------------
+# Modules we cannot build with old compiler
+
+PV_MODULES = pv% normativeTypes
+SKIP_BUILDS_5 = $(PV_MODULES)
+SKIP_BUILDS_OLD = $(PV_MODULES)
+SKIP_BUILDS_6 = $(SKIP_BUILDS_$(VX_OLD_GCC))
+SKIP_BUILDS = $(SKIP_BUILDS_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # no shared libs for vxWorks
diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index d798b50..386f145 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -18,6 +18,15 @@
 
 -->
 
+<h3>Skipping build of modules</h3>
+
+<p>Any module can be skipped during the build for a given architecture by setting
+the variable <tt>SKIP_BUILDS</tt> to a list of patterns matching the
+module directories to skip. For example to skip building any PV access related
+modules set <code>SKIP_BUILDS=pv%&nbsp;normativeTypes</code> in the
+CONFIG.Common.&lt;arch&gt; file for that architecture.
+</p>
+
 <h1 align="center">EPICS Release 7.0.1.1</h1>
 
 <h3>Changed SIML failure behavior</h3>