hadoop-hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zs...@apache.org
Subject svn commit: r903532 - in /hadoop/hive/trunk: CHANGES.txt odbc/Makefile odbc/build.xml odbc/src/cpp/hiveclienthelper.cpp
Date Wed, 27 Jan 2010 02:32:30 GMT
Author: zshao
Date: Wed Jan 27 02:32:29 2010
New Revision: 903532

URL: http://svn.apache.org/viewvc?rev=903532&view=rev
Log:
HIVE-898. Hive ODBC build fails on OSX. (Carl Steinbach and Ning Zhang via zshao)

Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/odbc/Makefile
    hadoop/hive/trunk/odbc/build.xml
    hadoop/hive/trunk/odbc/src/cpp/hiveclienthelper.cpp

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=903532&r1=903531&r2=903532&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Wed Jan 27 02:32:29 2010
@@ -79,6 +79,9 @@
     HIVE-1069. CREATE VIEW followup: find and document current expected
     version of thrift (John Sichi via namit)
 
+    HIVE-898. Hive ODBC build fails on OSX.
+    (Carl Steinbach and Ning Zhang via zshao)
+
 Release 0.5.0 -  Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hive/trunk/odbc/Makefile
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/odbc/Makefile?rev=903532&r1=903531&r2=903532&view=diff
==============================================================================
--- hadoop/hive/trunk/odbc/Makefile (original)
+++ hadoop/hive/trunk/odbc/Makefile Wed Jan 27 02:32:29 2010
@@ -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) \

Modified: hadoop/hive/trunk/odbc/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/odbc/build.xml?rev=903532&r1=903531&r2=903532&view=diff
==============================================================================
--- hadoop/hive/trunk/odbc/build.xml (original)
+++ hadoop/hive/trunk/odbc/build.xml Wed Jan 27 02:32:29 2010
@@ -62,6 +62,7 @@
     <exec dir="." executable="${make.cmd}" failonerror="true">
       <env key="WORD_SIZE" value="${word.size}"/>
       <env key="THRIFT_HOME" value="${thrift.home}"/>
+      <env key="BOOST_HOME" value="${boost.home}"/>
       <env key="HIVE_ROOT" value="${hive.root}"/>
       <env key="BASE_DIR" value="${basedir}"/>
     </exec>

Modified: hadoop/hive/trunk/odbc/src/cpp/hiveclienthelper.cpp
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/odbc/src/cpp/hiveclienthelper.cpp?rev=903532&r1=903531&r2=903532&view=diff
==============================================================================
--- hadoop/hive/trunk/odbc/src/cpp/hiveclienthelper.cpp (original)
+++ hadoop/hive/trunk/odbc/src/cpp/hiveclienthelper.cpp Wed Jan 27 02:32:29 2010
@@ -17,6 +17,7 @@
  */
 
 #include <algorithm>
+#include <assert.h>
 
 #include "hiveclienthelper.h"
 #include "thriftserverconstants.h"



Mime
View raw message