From fb1a0c2b1e3db8d956f47de11fd37dd1cbc26105 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sat, 28 Feb 2015 20:20:56 -0600 Subject: [PATCH 1/4] Clean up g++ warnings in repeater.cpp --- src/ca/repeater.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ca/repeater.cpp b/src/ca/repeater.cpp index 847431d34..5e123ee2d 100644 --- a/src/ca/repeater.cpp +++ b/src/ca/repeater.cpp @@ -89,14 +89,10 @@ static const unsigned short PORT_ANY = 0u; */ static int makeSocket ( unsigned short port, bool reuseAddr, SOCKET * pSock ) { - int status; - union { - struct sockaddr_in ia; - struct sockaddr sa; - } bd; - SOCKET sock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, 0 ); + if ( sock == INVALID_SOCKET ) { + *pSock = sock; return SOCKERRNO; } @@ -104,6 +100,11 @@ static int makeSocket ( unsigned short port, bool reuseAddr, SOCKET * pSock ) * no need to bind if unconstrained */ if ( port != PORT_ANY ) { + int status; + union { + struct sockaddr_in ia; + struct sockaddr sa; + } bd; memset ( (char *) &bd, 0, sizeof (bd) ); bd.ia.sin_family = AF_INET; From bc52c8e374018f9be84448fb4ece44f588aed1b9 Mon Sep 17 00:00:00 2001 From: Benjamin Franksen Date: Tue, 3 Mar 2015 11:45:23 -0600 Subject: [PATCH 2/4] Fixed RELEASE_PERL_MODULE_DIRS --- configure/CONFIG_APP_INCLUDE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure/CONFIG_APP_INCLUDE b/configure/CONFIG_APP_INCLUDE index 6b6786169..14113c951 100644 --- a/configure/CONFIG_APP_INCLUDE +++ b/configure/CONFIG_APP_INCLUDE @@ -16,7 +16,7 @@ define RELEASE_FLAGS_template RELEASE_INCLUDES += $$(addprefix -I,$$(wildcard $$(strip $$($(1)))/include)) RELEASE_DBD_DIRS += $$(wildcard $$(strip $$($(1)))/dbd) RELEASE_DB_DIRS += $$(wildcard $$(strip $$($(1)))/db) - RELEASE_PERL_MODULE_DIRS += $$(wildcard $$($(1)_LIB)/perl) + RELEASE_PERL_MODULE_DIRS += $$(wildcard $$(strip $$($(1)))/lib/perl) endef $(foreach top, $(RELEASE_TOPS), $(eval $(call RELEASE_FLAGS_template,$(top)) )) From 5f638805ddfccdff76810f2b5ebef50e244e665b Mon Sep 17 00:00:00 2001 From: Benjamin Franksen Date: Tue, 3 Mar 2015 11:47:37 -0600 Subject: [PATCH 3/4] Improved "Installing ..." messages in RULES.Db --- configure/RULES.Db | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure/RULES.Db b/configure/RULES.Db index f0a4f6868..11e4d40a6 100644 --- a/configure/RULES.Db +++ b/configure/RULES.Db @@ -199,7 +199,7 @@ $(COMMON_DIR)/%.substitutions: endif $(INSTALL_DB)/%.substitutions: %.substitutions - $(ECHO) "Installing db file $@" + $(ECHO) "Installing substitution file $@" @$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D) .PRECIOUS: $(COMMON_DIR)/%.substitutions @@ -213,7 +213,7 @@ $(COMMON_DIR)/%.template: $(COMMON_DIR)/%.edf @$(RM) $@.VAR $(INSTALL_DB)/%.template: %.template - $(ECHO) "Installing db file $@" + $(ECHO) "Installing template file $@" @$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D) .PRECIOUS: $(COMMON_DIR)/%.template @@ -351,7 +351,7 @@ $(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW) else $(INSTALL_DB)/%: % - $(ECHO) "Installing db file $@" + $(ECHO) "Installing $@" @$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D) endif From d26654674c7b131bfb4388586e23fe0a089d1260 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 3 Mar 2015 11:53:23 -0600 Subject: [PATCH 4/4] Fix the RTEMS override of the ECHO variable --- configure/os/CONFIG.Common.RTEMS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure/os/CONFIG.Common.RTEMS b/configure/os/CONFIG.Common.RTEMS index 2e3b73ac8..9e6a1ad41 100644 --- a/configure/os/CONFIG.Common.RTEMS +++ b/configure/os/CONFIG.Common.RTEMS @@ -73,6 +73,8 @@ CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\ $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\ $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS) +ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo) + #-------------------------------------------------- # Although RTEMS uses gcc, it wants to use gcc its own way CROSS_CPPFLAGS =