Skip to content

ARROW-2094: [C++] Install libprotobuf and set PROTOBUF_HOME when using toolchain #1664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wesm wants to merge 1 commit into from
Closed

ARROW-2094: [C++] Install libprotobuf and set PROTOBUF_HOME when using toolchain #1664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ci/travis_env_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ci/travis_install_toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if [ ! -e $CPP_TOOLCHAIN ]; then
conda create -y -q -p $CPP_TOOLCHAIN python=2.7 \
nomkl \
boost-cpp \
libprotobuf \
Copy link
Contributor

@cpcloud cpcloud Feb 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we also need to install protobuf? Are we assuming that libprotobuf and the protoc called by the orc build step are compatible?

Copy link
Member Author

@wesm wesm Feb 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

libprotobuf includes protoc

Copy link
Contributor

@cpcloud cpcloud Feb 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh okay, cool.

Copy link
Contributor

@cpcloud cpcloud Feb 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we are assuming that orc's protoc and ours are compatible? I could be missing something obvious here.

Copy link
Member Author

@wesm wesm Feb 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ORC build will just use this one; before this patch we were building protobuf ourselves from source in https://github.com/apache/arrow/blob/master/cpp/cmake_modules/ThirdpartyToolchain.cmake#L882

This does upgrade protocol buffers from 2.6.0 to 3.5.1, but I think it's forward compatible (might be wrong). If not we may need to add a protobuf 2.x package to conda-forge

rapidjson \
flatbuffers \
gflags \
Expand Down