Skip to content
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

ARROW-17193: [C++] Add support for finding system Abseil #13731

Merged
merged 12 commits into from
Aug 5, 2022
+973 −944
Merged

ARROW-17193: [C++] Add support for finding system Abseil #13731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4ab26b4
ARROW-17193: [C++] Add support for finding system Abseil
kou Jul 28, 2022
8f35b17
Add missing absl configurations
kou Jul 29, 2022
088f8ae
Add missing -Dabsl_SOURCE
kou Jul 29, 2022
bc8f306
Fix format
kou Jul 29, 2022
1f9b372
Add missing vendored check
kou Jul 29, 2022
a3444dd
Require Abseil 20211102.0 or later
kou Jul 29, 2022
0fef761
Require Abseil 20211102.0 or later
kou Jul 29, 2022
d410674
Add missing \
kou Jul 29, 2022
4f1b41d
Add missing absl_SOURCE=BUNDLED
kou Jul 29, 2022
67a0612
Remove needless .0
kou Jul 29, 2022
8a4f48f
Accept Abseil 20211102 or later
kou Jul 30, 2022
6e431de
Remove a needless check
kou Jul 30, 2022
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: 2 additions & 1 deletion ci/docker/debian-10-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ RUN apt-get update -y -q && \
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh latest /usr/local

ENV ARROW_BUILD_TESTS=ON \
ENV absl_SOURCE=BUNDLED \
ARROW_BUILD_TESTS=ON \
ARROW_DATASET=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
ARROW_FLIGHT=ON \
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/debian-11-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

ENV ARROW_BUILD_TESTS=ON \
ENV absl_SOURCE=BUNDLED \
ARROW_BUILD_TESTS=ON \
ARROW_DATASET=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
ARROW_FLIGHT=ON \
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/fedora-35-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

ENV ARROW_BUILD_TESTS=ON \
ENV absl_SOURCE=BUNDLED \
ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
ARROW_DATASET=ON \
ARROW_FLIGHT=ON \
Expand Down
4 changes: 3 additions & 1 deletion ci/docker/ubuntu-20.04-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,15 @@ RUN /arrow/ci/scripts/install_ceph.sh
# Prioritize system packages and local installation
# The following dependencies will be downloaded due to missing/invalid packages
# provided by the distribution:
# - Abseil is not packaged
# - libc-ares-dev does not install CMake config files
# - flatbuffer is not packaged
# - libgtest-dev only provide sources
# - libprotobuf-dev only provide sources
# ARROW-17051: this build uses static Protobuf, so we must also use
# static Arrow to run Flight/Flight SQL tests
ENV ARROW_BUILD_STATIC=ON \
ENV absl_SOURCE=BUNDLED \
ARROW_BUILD_STATIC=ON \
ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
ARROW_DATASET=ON \
Expand Down
4 changes: 3 additions & 1 deletion ci/docker/ubuntu-22.04-cpp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,15 @@ RUN /arrow/ci/scripts/install_gcs_testbench.sh default
# Prioritize system packages and local installation
# The following dependencies will be downloaded due to missing/invalid packages
# provided by the distribution:
# - Abseil is old
# - libc-ares-dev does not install CMake config files
# - flatbuffer is not packaged
# - libgtest-dev only provide sources
# - libprotobuf-dev only provide sources
# ARROW-17051: this build uses static Protobuf, so we must also use
# static Arrow to run Flight/Flight SQL tests
ENV ARROW_BUILD_STATIC=ON \
ENV absl_SOURCE=BUNDLED \
ARROW_BUILD_STATIC=ON \
ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
ARROW_DATASET=ON \
Expand Down
1 change: 1 addition & 0 deletions ci/scripts/cpp_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ mkdir -p ${build_dir}
pushd ${build_dir}

cmake \
-Dabsl_SOURCE=${absl_SOURCE:-} \
-DARROW_BOOST_USE_SHARED=${ARROW_BOOST_USE_SHARED:-ON} \
-DARROW_BUILD_BENCHMARKS_REFERENCE=${ARROW_BUILD_BENCHMARKS:-OFF} \
-DARROW_BUILD_BENCHMARKS=${ARROW_BUILD_BENCHMARKS:-OFF} \
Expand Down
Loading