This is an automated email from the ASF dual-hosted git repository. huor pushed a commit to branch huor in repository https://gitbox.apache.org/repos/asf/hawq.git
commit 08b9dc2c4dc5ba797f3b2b45a1dc263cdc86c97f Author: Ruilong Huo <[email protected]> AuthorDate: Sat Mar 9 13:52:33 2019 +0800 Build apache hawq on mac osx 10.14 platform --- src/Makefile.global.in | 2 +- src/backend/tcop/Makefile | 13 ++++++++++++- src/bin/gpfdist/Makefile | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 3691d79..5b9258b 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -550,7 +550,7 @@ ifeq ($(BLD_ARCH),osx106_x86) LIBS := $(LIBS) -framework CoreServices -framework IOKit endif -LIBS := $(LIBS) -lyarn -lkrb5 +LIBS := $(LIBS) -lyarn -lkrb5 -lssl ########################################################################## # diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile index 61b1955..79b40b0 100644 --- a/src/backend/tcop/Makefile +++ b/src/backend/tcop/Makefile @@ -12,7 +12,10 @@ subdir = src/backend/tcop top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -override CPPFLAGS := -I$(top_srcdir)/src/backend/resourcemanager/include $(CPPFLAGS) +override CPPFLAGS += -I/opt/dependency/package/include/openssl +override CPPFLAGS += -I$(top_srcdir)/src/backend/resourcemanager/include $(CPPFLAGS) + +LIBS := -lssl -lcrypto OBJS= dest.o fastpath.o postgres.o pquery.o utility.o @@ -21,3 +24,11 @@ override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT) endif include $(top_srcdir)/src/backend/common.mk + +UNAME = $(shell uname) +ifeq (Darwin, $(UNAME)) + INCLUDES := $(INCLUDES) -I/opt/dependency/package/include/openssl + LIBS := $(LIBS) -L/opt/dependency/package/lib +# INCLUDES := $(INCLUDES) -I/usr/local/opt/openssl/include +# LIBS := $(LIBS) -L/usr/local/opt/openssl/lib +endif diff --git a/src/bin/gpfdist/Makefile b/src/bin/gpfdist/Makefile index ef20efe..9d7d8e0 100644 --- a/src/bin/gpfdist/Makefile +++ b/src/bin/gpfdist/Makefile @@ -46,8 +46,8 @@ LIBS := $$($(APR_CFG) --link-ld --libs) $(LIBS) # workaround for 'brew link openssl --force' error on MacOS 10.12 UNAME = $(shell uname) ifeq (Darwin, $(UNAME)) - INCLUDES := $(INCLUDES) -I/usr/local/opt/openssl/include - LIBS := $(LIBS) -L/usr/local/opt/openssl/lib + INCLUDES := $(INCLUDES) -I/usr/local/Cellar/openssl/1.0.2q/include/openssl + LIBS := $(LIBS) -L/usr/local/Cellar/openssl/1.0.2q/lib endif sol10_sparc_32_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
