[arrow] branch master updated: GH-15012: [Packaging][deb] Use system Protobuf for Debian GNU/Linux bookworm (#15013)

[kou]

This is an automated email from the ASF dual-hosted git repository.

kou 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 2c768a1767 GH-15012: [Packaging][deb] Use system Protobuf for Debian 
GNU/Linux bookworm (#15013)
2c768a1767 is described below

commit 2c768a1767c0d7b33644910e0e96a949bc6f6f42
Author: Sutou Kouhei <k...@clear-code.com>
AuthorDate: Sun Dec 18 07:41:20 2022 +0900

    GH-15012: [Packaging][deb] Use system Protobuf for Debian GNU/Linux 
bookworm (#15013)
    
    libprotobuf-dev on Debian GNU/Linux bookworm is now 3.21.11:
    
    https://packages.debian.org/search?keywords=libprotobuf-dev
    
    We can use it for our package.
    
    This fixes the following package test failure:
    
    
https://github.com/ursacomputing/crossbow/actions/runs/3719263437/jobs/6308012451
    
        -- Could NOT find Protobuf (missing: Protobuf_LIBRARIES 
Protobuf_INCLUDE_DIR)
        CMake Error at CMakeLists.txt:24 (find_package):
          Found package configuration file:
    
            /usr/lib/x86_64-linux-gnu/cmake/Arrow/ArrowConfig.cmake
    
          but it set Arrow_FOUND to FALSE so package "Arrow" is considered to 
be NOT
          FOUND.  Reason given by package:
    
          Arrow could not be found because dependency ProtobufAlt could not be 
found.
    
        -- Configuring incomplete, errors occurred!
    * Closes: #15012
    
    Authored-by: Sutou Kouhei <k...@clear-code.com>
    Signed-off-by: Sutou Kouhei <k...@clear-code.com>
---
 dev/tasks/linux-packages/apache-arrow/Rakefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tasks/linux-packages/apache-arrow/Rakefile 
b/dev/tasks/linux-packages/apache-arrow/Rakefile
index d8149c07b2..016172d51d 100644
--- a/dev/tasks/linux-packages/apache-arrow/Rakefile
+++ b/dev/tasks/linux-packages/apache-arrow/Rakefile
@@ -128,9 +128,8 @@ class ApacheArrowPackageTask < PackageTask
   end
 
   def apt_prepare_debian_control_protobuf(control, target)
-    # Flight requires Protobuf 3.15.0 or later but Debian GNU/Linux
-    # bookwarm and Ubuntu 22.04 don't provide Protobuf 3.15.0 or later
-    # yet.
+    # Flight requires Protobuf 3.15.0 or later but Ubuntu 22.04
+    # doesn't provide Protobuf 3.15.0 or later yet.
     #
     # See also:
     #   * cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -144,7 +143,8 @@ class ApacheArrowPackageTask < PackageTask
     # enough resource to build with Flight.
     #
     # So, we can use system Protobuf only for arm64 for now.
-    if target.end_with?("-arm64")
+    case target
+    when /\Adebian-bookworm/, /-arm64\z/
       use_system_protobuf = ""
     else
       use_system_protobuf = "#"