Index: odbc/src/cpp/hiveclienthelper.cpp =================================================================== --- odbc/src/cpp/hiveclienthelper.cpp (revision 903486) +++ odbc/src/cpp/hiveclienthelper.cpp (working copy) @@ -17,6 +17,7 @@ */ #include +#include #include "hiveclienthelper.h" #include "thriftserverconstants.h" Index: odbc/Makefile =================================================================== --- odbc/Makefile (revision 903486) +++ odbc/Makefile (working copy) @@ -15,11 +15,12 @@ # # -# Note: This makefile depends on 4 environment variables to funtion correctly: +# Note: This makefile depends on 5 environment variables to funtion correctly: # a) WORD_SIZE # b) THRIFT_HOME # c) HIVE_ROOT # d) BASE_DIR +# e) BOOST_HOME # All these are passed by build.xml. # @@ -30,6 +31,15 @@ ARCH_FLAGS = -m64 -DARCH64 endif +OS=$(shell uname -s) + +ifeq ($(OS),Darwin) + LDFLAGS = -dynamiclib +else + LDFLAGS = -shared +endif + + AR = ar ARFLAGS = rcs ARXFLAGS = -x @@ -38,7 +48,6 @@ CXX = g++ CXXFLAGS = -Wall -g -fPIC LD = g++ -LDFLAGS = -shared INSTALL = /usr/bin/install -c SHELL = /bin/sh LIBTOOL = $(SHELL) /usr/bin/libtool @@ -56,6 +65,7 @@ INSTALL_PATH = /usr/local INSTALL_LIB_PATH = $(INSTALL_PATH)/lib INSTALL_INCLUDE_PATH = $(INSTALL_PATH)/include +BOOST_INCLUDE_PATH = $(BOOST_HOME)/include LIB_NAME = hiveclient SHLIB_VERSION = 1.0.0 @@ -101,6 +111,7 @@ HIVE_CLIENT_TEST = $(TEST_ODBC_BUILD_DIR)/HiveClientTestC INCLUDE_PATHS = -I$(THRIFT_INCLUDE_PATH) \ + -I$(BOOST_INCLUDE_PATH) \ -I$(FB303_SRC_DIR) \ -I$(SERVICE_SRC_DIR) \ -I$(METASTORE_SRC_DIR) \ Index: odbc/build.xml =================================================================== --- odbc/build.xml (revision 903486) +++ odbc/build.xml (working copy) @@ -62,6 +62,7 @@ +