Require Abseil 20211102.0 or later

apache · Jul 29, 2022 · 0fef761 · 0fef761
1 parent a3444dd
commit 0fef761
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/ci/docker/debian-10-cpp.dockerfile b/ci/docker/debian-10-cpp.dockerfile
@@ -44,7 +44,6 @@ RUN apt-get update -y -q && \
         gcc \
         gdb \
         git \
-        libabsl-dev \
         libbenchmark-dev \
         libboost-all-dev \
         libbrotli-dev \
@@ -77,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 \

diff --git a/ci/docker/debian-11-cpp.dockerfile b/ci/docker/debian-11-cpp.dockerfile
@@ -41,7 +41,6 @@ RUN apt-get update -y -q && \
         gcc \
         gdb \
         git \
-        libabsl-dev \
         libbenchmark-dev \
         libboost-all-dev \
         libbrotli-dev \
@@ -79,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 \

diff --git a/ci/docker/ubuntu-22.04-cpp.dockerfile b/ci/docker/ubuntu-22.04-cpp.dockerfile
@@ -70,7 +70,6 @@ RUN apt-get update -y -q && \
         cmake \
         gdb \
         git \
-        libabsl-dev \
         libbenchmark-dev \
         libboost-filesystem-dev \
         libboost-system-dev \
@@ -147,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 \