[GitHub] lide-reed closed pull request #302: Support to build thirdparty libraries automatically

[GitBox <gi...@apache.org>]

lide-reed closed pull request #302: Support to build thirdparty libraries automatically
URL: https://github.com/apache/incubator-doris/pull/302
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/env.sh b/env.sh
index 7be356c1..912443ed 100755
--- a/env.sh
+++ b/env.sh
@@ -27,10 +27,21 @@ if [[ -f ${DORIS_HOME}/custom_env.sh ]]; then
     source ${DORIS_HOME}/custom_env.sh
 fi
 
+# set DORIS_THIRDPARTY
+if [ -z ${DORIS_THIRDPARTY} ]; then
+    export DORIS_THIRDPARTY=${DORIS_HOME}/thirdparty
+fi
+
+# build thirdparty libraries if necessary
+if ! [[ -d ${DORIS_THIRDPARTY}/installed ]]; then
+    echo "Thirdparty libraries need to be build ..."
+    ${DORIS_THIRDPARTY}/build-thirdparty.sh
+fi
+
 # check java version
 if [ -z ${JAVA_HOME} ]; then
     echo "Error: JAVA_HOME is not set, use thirdparty/installed/jdk1.8.0_131"
-    export JAVA_HOME=${DORIS_HOME}/thirdparty/installed/jdk1.8.0_131
+    export JAVA_HOME=${DORIS_THIRDPARTY}/installed/jdk1.8.0_131
 fi
 
 export JAVA=${JAVA_HOME}/bin/java
@@ -57,8 +68,4 @@ if ! ${PYTHON} --version; then
     fi
 fi
 
-# set DORIS_THIRDPARTY
-if [ -z ${DORIS_THIRDPARTY} ]; then
-    export DORIS_THIRDPARTY=${DORIS_HOME}/thirdparty
-fi
 
diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh
index dff1a89a..0106c19c 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -230,5 +230,14 @@ if [ ! -f $PATCHED_MARK ]; then
     touch $PATCHED_MARK
 fi
 cd -
-echo "Finished patching $LZ4_SOURCE"
+echo "Finished patching $BRPC_SOURCE"
+
+# boost patch to avoid compile failed by GCC version less than 5.0
+cd $TP_SOURCE_DIR/$BOOST_SOURCE
+if [ ! -f $PATCHED_MARK ]; then
+    patch -p0 < $TP_PATCH_DIR/boost-1.64.0-gcc4.8.patch
+    touch $PATCHED_MARK
+fi
+cd -
+echo "Finished patching $BOOST_SOURCE"
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@doris.apache.org
For additional commands, e-mail: dev-help@doris.apache.org