This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 5521bcf ARROW-2094: [C++] Install libprotobuf and set PROTOBUF_HOME
when using toolchain
5521bcf is described below
commit 5521bcf1af07a539ef1bf632b49c9d4089ecad63
Author: Wes McKinney <[email protected]>
AuthorDate: Mon Feb 26 11:54:24 2018 -0500
ARROW-2094: [C++] Install libprotobuf and set PROTOBUF_HOME when using
toolchain
C++-only libprotobuf is now being provided by conda-forge
Author: Wes McKinney <[email protected]>
Closes #1664 from wesm/ARROW-2094 and squashes the following commits:
cec6c887 <Wes McKinney> Install libprotobuf and set PROTOBUF_HOME when
using toolchain
---
ci/travis_env_common.sh | 3 +++
ci/travis_install_toolchain.sh | 1 +
2 files changed, 4 insertions(+)
diff --git a/ci/travis_env_common.sh b/ci/travis_env_common.sh
index 21b6e26..416977c 100755
--- a/ci/travis_env_common.sh
+++ b/ci/travis_env_common.sh
@@ -47,6 +47,9 @@ if [ "$ARROW_TRAVIS_USE_TOOLCHAIN" == "1" ]; then
export ARROW_BUILD_TOOLCHAIN=$CPP_TOOLCHAIN
export BOOST_ROOT=$CPP_TOOLCHAIN
+ # Protocol buffers used by Apache ORC thirdparty build
+ export PROTOBUF_HOME=$CPP_TOOLCHAIN
+
export PATH=$CPP_TOOLCHAIN/bin:$PATH
export LD_LIBRARY_PATH=$CPP_TOOLCHAIN/lib:$LD_LIBRARY_PATH
export TRAVIS_MAKE=ninja
diff --git a/ci/travis_install_toolchain.sh b/ci/travis_install_toolchain.sh
index b5eb137..31076b2 100755
--- a/ci/travis_install_toolchain.sh
+++ b/ci/travis_install_toolchain.sh
@@ -26,6 +26,7 @@ if [ ! -e $CPP_TOOLCHAIN ]; then
conda create -y -q -p $CPP_TOOLCHAIN python=2.7 \
nomkl \
boost-cpp \
+ libprotobuf \
rapidjson \
flatbuffers \
gflags \
--
To stop receiving notification emails like this one, please contact
[email protected].
