Repository: trafodion Updated Branches: refs/heads/master 330235a0b -> 607e8a7c1
[TRAFODION-1861] Run Trafodion on CentOS 7 Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/4addf763 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/4addf763 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/4addf763 Branch: refs/heads/master Commit: 4addf763ee18eb9cb01e2bd0fecde297a60f485c Parents: fe62cce Author: LiuMing <[email protected]> Authored: Tue May 8 12:01:46 2018 +0800 Committer: LiuMing <[email protected]> Committed: Tue May 8 12:01:46 2018 +0800 ---------------------------------------------------------------------- core/sqf/macros.gmk | 6 ++++++ core/sqf/src/seabed/src/Makefile | 13 +++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/4addf763/core/sqf/macros.gmk ---------------------------------------------------------------------- diff --git a/core/sqf/macros.gmk b/core/sqf/macros.gmk index b21ab1b..1b6a9a8 100644 --- a/core/sqf/macros.gmk +++ b/core/sqf/macros.gmk @@ -141,3 +141,9 @@ CDEPFLAGS = -Wp,-MD,$(CDEP_FILE) -Wp,-MT,$@ CDEPFILES = $(CDEP_DIR)/*.dep CDEP_DIR = $(OUTDIR)/depend CDEP_FILE = $(CDEP_DIR)/$<.dep + +GCC_FULL_VERSION := $(shell gcc -dumpversion) +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_MINOR_VERSION_GT_4 := $(shell expr $(GCC_MINOR_VERSION) \> 4) http://git-wip-us.apache.org/repos/asf/trafodion/blob/4addf763/core/sqf/src/seabed/src/Makefile ---------------------------------------------------------------------- diff --git a/core/sqf/src/seabed/src/Makefile b/core/sqf/src/seabed/src/Makefile index f3a5ef7..0c9bdd1 100644 --- a/core/sqf/src/seabed/src/Makefile +++ b/core/sqf/src/seabed/src/Makefile @@ -55,6 +55,16 @@ LIBSBUTIL = $(LIBEXPDIR)/libsbutil.so LIBSQSTATESB = $(LIBEXPDIR)/libsqstatesb.so # neet -lrt for clock_gettime 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_GT_3),1) +ifeq ($(GCC_MINOR_VERSION_GT_4),1) +MS_MPITMSG_O = $(OUTDIR)/ms.o \ + $(OUTDIR)/mpitmsg.o +endif +endif OBJSBFS = $(OUTDIR)/fs.o \ @@ -78,8 +88,7 @@ OBJSBMS = $(OUTDIR)/apictr.o \ $(OUTDIR)/mapmd.o \ $(OUTDIR)/mapstats.o \ $(OUTDIR)/monclio.o \ - $(OUTDIR)/mpitmsg.o \ - $(OUTDIR)/ms.o \ + $(MS_MPITMSG_O) \ $(OUTDIR)/mserr.o \ $(OUTDIR)/mseventmgr.o \ $(OUTDIR)/msic.o \
