From 87bdd53eb3236c527352e3f182f68d32d6b42096 Mon Sep 17 00:00:00 2001 From: Weston Pace Date: Wed, 16 Feb 2022 09:57:42 -1000 Subject: [PATCH] ARROW-15700: Add minimum version for protobuf when building ARROW_ENGINE --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 3 ++- dev/tasks/tasks.yml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 32af0a00ad1..bb4524888a3 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -1523,8 +1523,9 @@ macro(build_protobuf) endmacro() if(ARROW_WITH_PROTOBUF) - if(ARROW_WITH_GRPC) + if(ARROW_WITH_GRPC OR ARROW_ENGINE) # FlightSQL uses proto3 optionals, which require 3.15 or later. + # Substrait (via ARROW_ENGINE) also relies on these optionals set(ARROW_PROTOBUF_REQUIRED_VERSION "3.15.0") elseif(ARROW_GANDIVA_JAVA) # google::protobuf::MessageLite::ByteSize() is deprecated since diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index ce8bc39b78c..27702e7d38a 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -1049,6 +1049,9 @@ tasks: params: env: UBUNTU: "{{ ubuntu_version }}" + {% if ubuntu_version == "18.04" %} + flags: -e ARROW_ENGINE=OFF + {% endif %} image: ubuntu-cpp {% endfor %}