Merge branch 'e3-714-update_patches_for_base_7.0.6.1' into 'master'

Update EPICS base patch files to work with 7.0.6.1

See merge request e3/e3-base!18

configure/CONFIG_BASE

 
 # Absolute PATH SHOULD be used
 E3_EPICS_PATH:=/epics
-EPICS_BASE_TAG:=tags/R7.0.5
-E3_BASE_VERSION:=7.0.5
+EPICS_BASE_TAG:=tags/R7.0.6.1
+E3_BASE_VERSION:=7.0.6.1
 
 E3_CROSS_COMPILER_TARGET_ARCHS:=linux-ppc64e6500
 E3_CROSS_COMPILER_TARGET_ARCHS+=linux-corei7-poky

patch/Site/R7.0.6.1/add_pvdatabase_nt_softIocPVA.p0.patch

+Submodule modules/pva2pva contains modified content
+diff --git modules/pva2pva/pdbApp/Makefile modules/pva2pva/pdbApp/Makefile
+index 82165fd..5181ee5 100644
+--- modules/pva2pva/pdbApp/Makefile
++++ modules/pva2pva/pdbApp/Makefile
+@@ -64,12 +64,15 @@ FINAL_LOCATION ?= $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION))
+ # EPICS_BASE macro for our location 
+ USR_CPPFLAGS += -DEPICS_BASE="\"$(FINAL_LOCATION)\""
+ 
++USR_LDFLAGS_Linux  += -Wl,--no-as-needed
++
+ PROD_IOC += softIocPVA
+ 
+ softIocPVA_SRCS += softMain.cpp
+ softIocPVA_SRCS += softIocPVA_registerRecordDeviceDriver.cpp
+ 
+ softIocPVA_LIBS += qsrv
++softIocPVA_LIBS += pvDatabase nt
+ softIocPVA_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
+ softIocPVA_LIBS += $(EPICS_BASE_IOC_LIBS)
+ 
+@@ -84,6 +87,7 @@ endif
+ softIocPVA_DBD += softIoc.dbd
+ softIocPVA_DBD += PVAServerRegister.dbd
+ softIocPVA_DBD += qsrv.dbd
++softIocPVA_DBD += registerChannelProviderLocal.dbd
+ 
+ #===========================
+ 

patch/Site/R7.0.6.1/config_site-x86_84_c++11.p0.patch

+diff --git configure/os/CONFIG_SITE.Common.linux-x86_64 configure/os/CONFIG_SITE.Common.linux-x86_64
+index e098b76..4fb90dd 100644
+--- configure/os/CONFIG_SITE.Common.linux-x86_64
++++ configure/os/CONFIG_SITE.Common.linux-x86_64
+@@ -14,6 +14,7 @@
+ # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
+ #    to inform the system of the shared library location.
+ 
++ARCH_DEP_CXXFLAGS += -std=c++11
+ 
+ # Use GNU Readline if the header file is installed
+ COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \

patch/Site/R7.0.6.1/enable_new_dtags.p0.patch

+diff --git configure/CONFIG.gnuCommon configure/CONFIG.gnuCommon
+index c4fd8cedd..d30910c5a 100644
+--- configure/CONFIG.gnuCommon
++++ configure/CONFIG.gnuCommon
+@@ -55,8 +55,8 @@ STATIC_LDFLAGS_YES = -static
+ STATIC_LDFLAGS_NO =
+ 
+ SHRLIB_CFLAGS = -fPIC
+-SHRLIB_LDFLAGS = -shared -fPIC -Wl,-h$@
+-LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC -Wl,-h$@
++SHRLIB_LDFLAGS = -shared -fPIC  -Wl,-h$@,--enable-new-dtags
++LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC -Wl,-h$@,--enable-new-dtags
+ 
+ GNU_LDLIBS_YES = -lgcc
+ 

patch/Site/R7.0.6.1/ess_epics_host_arch.p0.patch

+diff --git src/tools/EpicsHostArch.pl src/tools/EpicsHostArch.pl
+index e8e49bc5e..49e31dc2c 100644
+--- src/tools/EpicsHostArch.pl
++++ src/tools/EpicsHostArch.pl
+@@ -32,7 +32,6 @@ 
+ sub HostArch {
+     my $arch = $Config{archname};
+     for ($arch) {
+-        return 'linux-x86_64'   if m/^x86_64-linux/;
+         return 'linux-x86'      if m/^i[3-6]86-linux/;
+         return 'linux-arm'      if m/^arm-linux/;
+         return 'linux-aarch64'  if m/^aarch64-linux/;
+@@ -43,8 +42,11 @@ 
+         return "cygwin-x86"     if m/^i[3-6]86-cygwin/;
+         return 'solaris-sparc'  if m/^sun4-solaris/;
+         return 'solaris-x86'    if m/^i86pc-solaris/;
+-
+         my ($kernel, $hostname, $release, $version, $cpu) = uname;
++	if (m/^x86_64-linux/) {
++	    if ( $release=~ m/cct$/) {return "linux-corei7-poky";}
++            else                     {return "linux-x86_64"; }
++        }
+         if (m/^darwin/) {
+             for ($cpu) {
+                 return 'darwin-x86' if m/^x86_64/;
+@@ -52,7 +54,12 @@
+             }
+             die "$0: macOS CPU type '$cpu' not recognized\n";
+         }
+-
++        if (m/^powerpc64-linux/) {
++            for ($cpu) {
++		return 'linux-ppc64e6500' if m/^ppc64/;
++            }
++            die "$0: linux-ppc64 OS CPU type '$cpu' not recognized\n";
++        }
+         die "$0: Architecture '$arch' not recognized\n";
+     }
+ }

patch/Site/R7.0.6.1/os_class.p0.patch

+diff --git configure/CONFIG_APP_INCLUDE configure/CONFIG_APP_INCLUDE
+index 8b4bd7d08..21de4ad39 100644
+--- configure/CONFIG_APP_INCLUDE
++++ configure/CONFIG_APP_INCLUDE
+@@ -19,7 +19,7 @@ define  RELEASE_FLAGS_template
+   $(1)_LIB = $$(wildcard $$(strip $$($(1)))/lib/$(T_A))
+   SHRLIB_SEARCH_DIRS += $$($(1)_LIB)
+   RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/compiler/$(CMPLR_CLASS)))
+-  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/os/$(OS_CLASS)))
++  RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include/os/$$(OS_CLASS)))
+   RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include))
+   RELEASE_DBD_DIRS += $$(wildcard $$(strip $$($(1)))/dbd)
+   RELEASE_DB_DIRS += $$(wildcard $$(strip $$($(1)))/db)

patch/Site/R7.0.6.1/remove_mkdir_from_rules_build.p0.patch

+diff --git configure/RULES_BUILD configure/RULES_BUILD
+index 0735f5598..3977a6a03 100644
+--- configure/RULES_BUILD
++++ configure/RULES_BUILD
+@@ -331,7 +331,7 @@ 	$(MT_DLL_COMMAND)
+ 
+ $(LIBNAME) $(SHRLIBNAME) $(LOADABLE_SHRLIBNAME): | $(INSTALL_LIB)
+ $(INSTALL_LIB):
+-	@$(MKDIR) $@
++#	@$(MKDIR) $@
+ 
+ #---------------------------------------------------------------
+ # C++ munching for VxWorks