You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2019/06/22 19:59:35 UTC
[arrow] branch master updated: ARROW-5687: [C++] Remove remaining
uses of ARROW_BOOST_VENDORED
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 53ac71a ARROW-5687: [C++] Remove remaining uses of ARROW_BOOST_VENDORED
53ac71a is described below
commit 53ac71a8371a0da4df7dcf1873d76518bddd8407
Author: Neal Richardson <ne...@gmail.com>
AuthorDate: Sat Jun 22 14:59:24 2019 -0500
ARROW-5687: [C++] Remove remaining uses of ARROW_BOOST_VENDORED
https://github.com/apache/arrow/pull/4623 deprecated ARROW_BOOST_VENDORED but we still called it in a couple of places. This removes them.
Author: Neal Richardson <ne...@gmail.com>
Closes #4656 from nealrichardson/ARROW_BOOST_VENDORED and squashes the following commits:
52f46209b <Neal Richardson> @kou's patch
e0a49fed1 <Neal Richardson> Remove remaining uses of ARROW_BOOST_VENDORED
---
cpp/Dockerfile.ubuntu-trusty | 2 +-
cpp/Dockerfile.ubuntu-xenial | 2 +-
cpp/cmake_modules/ThirdpartyToolchain.cmake | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cpp/Dockerfile.ubuntu-trusty b/cpp/Dockerfile.ubuntu-trusty
index bca5177..b948e4f 100644
--- a/cpp/Dockerfile.ubuntu-trusty
+++ b/cpp/Dockerfile.ubuntu-trusty
@@ -58,7 +58,6 @@ RUN apt-get update -y -q && \
# - liblz4-dev is too old
ENV CC=gcc \
CXX=g++ \
- ARROW_BOOST_VENDORED=ON \
ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
ARROW_FLIGHT=OFF \
@@ -69,6 +68,7 @@ ENV CC=gcc \
ARROW_PARQUET=ON \
ARROW_HOME=/usr \
CMAKE_ARGS="-DThrift_SOURCE=BUNDLED \
+-DBOOST_SOURCE=BUNDLED \
-Dbenchmark_SOURCE=BUNDLED \
-DBrotli_SOURCE=BUNDLED \
-Dc-ares_SOURCE=BUNDLED \
diff --git a/cpp/Dockerfile.ubuntu-xenial b/cpp/Dockerfile.ubuntu-xenial
index 40a537b..4729093 100644
--- a/cpp/Dockerfile.ubuntu-xenial
+++ b/cpp/Dockerfile.ubuntu-xenial
@@ -66,7 +66,6 @@ RUN apt-get update -y -q && \
# - liburiparser-dev is too old (< 0.9.0)
ENV CC=gcc \
CXX=g++ \
- ARROW_BOOST_VENDORED=ON \
ARROW_BUILD_BENCHMARKS=OFF \
ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
@@ -76,6 +75,7 @@ ENV CC=gcc \
ARROW_HOME=/usr \
ARROW_WITH_ZSTD=OFF \
CMAKE_ARGS="-DThrift_SOURCE=BUNDLED \
+-DBOOST_SOURCE=BUNDLED \
-Dc-ares_SOURCE=BUNDLED \
-DFlatbuffers_SOURCE=BUNDLED \
-Dgflags_SOURCE=BUNDLED \
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index df0839e..c4653ab 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -543,6 +543,7 @@ macro(build_boost)
set(Boost_INCLUDE_DIR "${BOOST_PREFIX}")
set(Boost_INCLUDE_DIRS "${BOOST_INCLUDE_DIR}")
add_dependencies(toolchain boost_ep)
+ set(BOOST_VENDORED TRUE)
endmacro()
if(ARROW_FLIGHT AND ARROW_BUILD_TESTS)
@@ -1147,7 +1148,7 @@ macro(build_thrift)
endif()
set(THRIFT_DEPENDENCIES ${THRIFT_DEPENDENCIES} ${ZLIB_LIBRARY})
- if(ARROW_BOOST_VENDORED)
+ if(BOOST_VENDORED)
set(THRIFT_DEPENDENCIES ${THRIFT_DEPENDENCIES} boost_ep)
endif()