This is an automated email from the ASF dual-hosted git repository.
zhaoc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 1ca8212 Fix doris be compile error for Ubuntu14.04 (#2647)
1ca8212 is described below
commit 1ca82122a86b2b8af255de38e92a4268d9585b94
Author: caiconghui <[email protected]>
AuthorDate: Fri Jan 3 21:14:34 2020 +0800
Fix doris be compile error for Ubuntu14.04 (#2647)
---
thirdparty/build-thirdparty.sh | 20 ++++++++++++++++++--
thirdparty/vars.sh | 2 +-
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index 92094fa..26e621e 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -352,7 +352,8 @@ build_snappy() {
cp $TP_INCLUDE_DIR/snappy/snappy-c.h $TP_INCLUDE_DIR/snappy-c.h && \
cp $TP_INCLUDE_DIR/snappy/snappy-sinksource.h
$TP_INCLUDE_DIR/snappy-sinksource.h && \
cp $TP_INCLUDE_DIR/snappy/snappy-stubs-public.h
$TP_INCLUDE_DIR/snappy-stubs-public.h && \
- cp $TP_INCLUDE_DIR/snappy/snappy.h $TP_INCLUDE_DIR/snappy.h
+ cp $TP_INCLUDE_DIR/snappy/snappy.h $TP_INCLUDE_DIR/snappy.h && \
+ cp $TP_INSTALL_DIR/lib/libsnappy.a $TP_INSTALL_DIR/libsnappy.a
}
# gperftools
@@ -425,7 +426,7 @@ build_curl() {
LDFLAGS="-L${TP_LIB_DIR}" LIBS="-lcrypto -lssl -lcrypto -ldl" \
CFLAGS="-fPIC" \
./configure --prefix=$TP_INSTALL_DIR --disable-shared --enable-static \
- --with-ssl=${TP_INSTALL_DIR} --without-libidn2 --disable-ldap --enable-ipv6
+ --without-librtmp --with-ssl=${TP_INSTALL_DIR} --without-libidn2
--disable-ldap --enable-ipv6
make -j$PARALLEL && make install
}
@@ -541,6 +542,20 @@ build_librdkafka() {
make -j$PARALLEL && make install
}
+# flatbuffers
+build_flatbuffers() {
+ check_if_source_exist $FLATBUFFERS_SOURCE
+ cd $TP_SOURCE_DIR/$FLATBUFFERS_SOURCE
+ mkdir build -p && cd build
+ rm -rf CMakeCache.txt CMakeFiles/
+ cmake ..
+ CXXFLAGS="-fPIC" make -j$PARALLEL
+ cp flatc ../../../installed/bin/flatc
+ cp -r ../include/flatbuffers ../../../installed/include/flatbuffers
+ cp libflatbuffers.a ../../../installed/lib/libflatbuffers.a
+}
+
+# arrow
build_arrow() {
check_if_source_exist $ARROW_SOURCE
cd $TP_SOURCE_DIR/$ARROW_SOURCE/cpp && mkdir -p release && cd release
@@ -703,6 +718,7 @@ build_leveldb
build_brpc
build_rocksdb
build_librdkafka
+build_flatbuffers
build_arrow
build_s2
build_bitshuffle
diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh
index 9e67640..63c2a4a 100644
--- a/thirdparty/vars.sh
+++ b/thirdparty/vars.sh
@@ -231,7 +231,7 @@ BROTLI_MD5SUM="7b6edd4f2128f22794d0ca28c53898a5"
# flatbuffers
FLATBUFFERS_DOWNLOAD="https://github.com/google/flatbuffers/archive/v1.10.0.tar.gz";
FLATBUFFERS_NAME=flatbuffers-v1.10.0.tar.gz
-FLATBUFFERS_SOURCE=flatbuffers-v1.10.0
+FLATBUFFERS_SOURCE=flatbuffers-1.10.0
FLATBUFFERS_MD5SUM="f7d19a3f021d93422b0bc287d7148cd2"
# arrow
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
