trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [4/5] trafodion git commit: fix review comments
Date Mon, 14 May 2018 16:45:54 GMT
fix review comments


Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/ab112eac
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/ab112eac
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/ab112eac

Branch: refs/heads/master
Commit: ab112eac8048484593596c096432e38663b7270a
Parents: e2e6f9f
Author: LiuMing <ovis_poly@sina.com>
Authored: Fri May 11 15:49:00 2018 +0800
Committer: LiuMing <ovis_poly@sina.com>
Committed: Fri May 11 15:49:00 2018 +0800

----------------------------------------------------------------------
 core/sqf/macros.gmk              |  2 ++
 core/sqf/src/seabed/src/Makefile | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/ab112eac/core/sqf/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/macros.gmk b/core/sqf/macros.gmk
index 00e7ced..0fa5f3d 100644
--- a/core/sqf/macros.gmk
+++ b/core/sqf/macros.gmk
@@ -147,4 +147,6 @@ GCC_MAJOR_VERSION := $(shell echo $(GCC_FULL_VERSION) | cut -d. -f 1)
 GCC_MINOR_VERSION := $(shell echo $(GCC_FULL_VERSION) | cut -d. -f 2)
 GCC_MAJOR_VERSION_GT_3 := $(shell expr $(GCC_MAJOR_VERSION) \> 3)
 GCC_MAJOR_VERSION_EQ_4 := $(shell expr $(GCC_MAJOR_VERSION) \= 4)
+GCC_MAJOR_VERSION_LT_4 := $(shell expr $(GCC_MAJOR_VERSION) \< 4)
 GCC_MINOR_VERSION_GT_4 := $(shell expr $(GCC_MINOR_VERSION) \> 4)
+GCC_MINOR_VERSION_LT_5 := $(shell expr $(GCC_MINOR_VERSION) \< 5)

http://git-wip-us.apache.org/repos/asf/trafodion/blob/ab112eac/core/sqf/src/seabed/src/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/src/Makefile b/core/sqf/src/seabed/src/Makefile
index 186949c..3d77af6 100644
--- a/core/sqf/src/seabed/src/Makefile
+++ b/core/sqf/src/seabed/src/Makefile
@@ -57,15 +57,22 @@ LIBSQSTATESB	= $(LIBEXPDIR)/libsqstatesb.so
 LIBSX	       += -lrt
 #
 # the order of these objects have to be swapped based on the GCC version
-MS_MPITMSG_O	= $(OUTDIR)/mpitmsg.o \
-		  $(OUTDIR)/ms.o 
-ifeq ($(GCC_MAJOR_VERSION_EQ_4),1)
-ifeq ($(GCC_MINOR_VERSION_GT_4),1)
 MS_MPITMSG_O	= $(OUTDIR)/ms.o \
-		  $(OUTDIR)/mpitmsg.o
+		  $(OUTDIR)/mpitmsg.o 
+
+#if major version is 4, check minor version, if minor version < 5, it is old CentOS
+ifeq ($(GCC_MAJOR_VERSION_EQ_4),1)
+ifeq ($(GCC_MINOR_VERSION_LT_5),1)
+MS_MPITMSG_O	= $(OUTDIR)/mpitmsg.o \
+		  $(OUTDIR)/ms.o
 endif
 endif
 
+#if major version is less than 4, it must be older CentOS version
+ifeq ($(GCC_MAJOR_VERSION_LT_4),1)
+MS_MPITMSG_O	= $(OUTDIR)/mpitmsg.o \
+		  $(OUTDIR)/ms.o
+endif
 
 OBJSBFS		= $(OUTDIR)/fs.o \
 		  $(OUTDIR)/fsfname.o \


Mime
View raw message