Require Abseil 20211102.0 or later

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

Hide file tree

Showing 6 changed files with 3 additions and 18 deletions.
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -2659,6 +2659,7 @@ endmacro()
 # ----------------------------------------------------------------------
 # Dependencies for Arrow Flight RPC
 
+set(ARROW_ABSL_REQUIRED_VERSION "20211102.0")
 macro(build_absl)
   # This may be called multiple times.
   if(NOT ABSL_VENDORED)
@@ -3609,7 +3610,7 @@ macro(build_grpc)
                      TRUE
                      PC_PACKAGE_NAMES
                      libcares)
-  resolve_dependency(absl)
+  resolve_dependency(absl REQUIRED_VERSION ${ARROW_ABSL_REQUIRED_VERSION})
 
   message(STATUS "Building gRPC from source")
 
@@ -4015,7 +4016,7 @@ macro(build_google_cloud_cpp_storage)
   message(STATUS "Only building the google-cloud-cpp::storage component")
 
   # List of dependencies taken from https://github.com/googleapis/google-cloud-cpp/blob/master/doc/packaging.md
-  resolve_dependency(absl)
+  resolve_dependency(absl REQUIRED_VERSION ${ARROW_ABSL_REQUIRED_VERSION})
   build_crc32c_once()
 
   # Curl is required on all platforms, but building it internally might also trip over S3's copy.

diff --git a/dev/tasks/linux-packages/apache-arrow/Rakefile b/dev/tasks/linux-packages/apache-arrow/Rakefile
@@ -96,16 +96,6 @@ class ApacheArrowPackageTask < PackageTask
     control.gsub(/@CUDA_ARCHITECTURE@/, cuda_architecture)
   end
 
-  def apt_prepare_debian_control_absl(control, target)
-    case target
-    when /\Aubuntu-bionic/, /\Aubuntu-focal/
-      use_system_absl = "#"
-    else
-      use_system_absl = ""
-    end
-    control.gsub(/@USE_SYSTEM_ABSL@/, use_system_absl)
-  end
-
   def apt_prepare_debian_control_c_ares(control, target)
     case target
     when /\Aubuntu-bionic/
@@ -169,7 +159,6 @@ class ApacheArrowPackageTask < PackageTask
   def apt_prepare_debian_control(control_in, target)
     control = control_in.dup
     control = apt_prepare_debian_control_cuda_architecture(control, target)
-    control = apt_prepare_debian_control_absl(control, target)
     control = apt_prepare_debian_control_c_ares(control, target)
     control = apt_prepare_debian_control_grpc(control, target)
     control = apt_prepare_debian_control_python(control, target)

diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-bookworm/Dockerfile
@@ -41,7 +41,6 @@ RUN \
     devscripts \
     git \
     gtk-doc-tools \
-    libabsl-dev \
     libboost-filesystem-dev \
     libboost-system-dev \
     libbrotli-dev \

diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile
@@ -41,7 +41,6 @@ RUN \
     devscripts \
     git \
     gtk-doc-tools \
-    libabsl-dev \
     libboost-filesystem-dev \
     libboost-system-dev \
     libbrotli-dev \

diff --git a/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/ubuntu-jammy/Dockerfile
@@ -39,7 +39,6 @@ RUN \
     devscripts \
     git \
     gtk-doc-tools \
-    libabsl-dev \
     libboost-filesystem-dev \
     libboost-system-dev \
     libbrotli-dev \

diff --git a/dev/tasks/linux-packages/apache-arrow/debian/control.in b/dev/tasks/linux-packages/apache-arrow/debian/control.in
@@ -8,7 +8,6 @@ Build-Depends:
   git,
   gobject-introspection,
   gtk-doc-tools,
-@USE_SYSTEM_ABSL@  libabsl-dev,
   libboost-filesystem-dev,
   libboost-system-dev,
   libbrotli-dev,
@@ -143,7 +142,6 @@ Multi-Arch: same
 Depends:
   ${misc:Depends},
   libarrow900 (= ${binary:Version}),
-@USE_SYSTEM_ABSL@  libabsl-dev,
   libbrotli-dev,
   libbz2-dev,
 @USE_SYSTEM_C_ARES@  libc-ares-dev,