From cec6c8875d94f883c6524b0b3f38002a439e2948 Mon Sep 17 00:00:00 2001 From: Wes McKinney Date: Mon, 26 Feb 2018 10:59:15 -0500 Subject: [PATCH] Install libprotobuf and set PROTOBUF_HOME when using toolchain Change-Id: I1b901957b362d1d78e1ab8c2658cfcf4964e0e36 --- 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 21b6e266ea6..416977c1301 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 b5eb137ba91..31076b2e736 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 \