[arrow] branch master updated: ARROW-17082: [CI][Conan] Enable Brotli (#13617)

[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 afc6840c28 ARROW-17082: [CI][Conan] Enable Brotli (#13617)
afc6840c28 is described below

commit afc6840c28f69f1554fa4a974b90195348f48978
Author: Sutou Kouhei <k...@clear-code.com>
AuthorDate: Sat Jul 16 06:27:03 2022 +0900

    ARROW-17082: [CI][Conan] Enable Brotli (#13617)
    
    Authored-by: Sutou Kouhei <k...@clear-code.com>
    Signed-off-by: Sutou Kouhei <k...@clear-code.com>
---
 ci/conan/all/conanfile.py | 2 +-
 ci/scripts/conan_build.sh | 3 +++
 dev/tasks/tasks.yml       | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py
index 0d82d98db3..97acd839cd 100644
--- a/ci/conan/all/conanfile.py
+++ b/ci/conan/all/conanfile.py
@@ -376,7 +376,7 @@ class ArrowConan(ConanFile):
             self._cmake.definitions["ARROW_BROTLI_USE_SHARED"] = 
self.options["brotli"].shared
         self._cmake.definitions["gflags_SOURCE"] = "SYSTEM"
         if self._with_gflags():
-            self._cmake.definitions["ARROW_BROTLI_USE_SHARED"] = 
self.options["gflags"].shared
+            self._cmake.definitions["ARROW_GFLAGS_USE_SHARED"] = 
self.options["gflags"].shared
         self._cmake.definitions["ARROW_WITH_BZ2"] = self.options.with_bz2
         self._cmake.definitions["BZip2_SOURCE"] = "SYSTEM"
         if self.options.with_bz2:
diff --git a/ci/scripts/conan_build.sh b/ci/scripts/conan_build.sh
index 9a1ab77b82..11952509c8 100755
--- a/ci/scripts/conan_build.sh
+++ b/ci/scripts/conan_build.sh
@@ -31,6 +31,9 @@ conan_args=()
 if [ -n "${ARROW_CONAN_PARQUET:-}" ]; then
   conan_args+=(--options arrow:parquet=${ARROW_CONAN_PARQUET})
 fi
+if [ -n "${ARROW_CONAN_WITH_BROTLI:-}" ]; then
+  conan_args+=(--options arrow:with_brotli=${ARROW_CONAN_WITH_BROTLI})
+fi
 if [ -n "${ARROW_CONAN_WITH_JEMALLOC:-}" ]; then
   conan_args+=(--options arrow:with_jemalloc=${ARROW_CONAN_WITH_JEMALLOC})
 fi
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index f52fe1428a..71a60d2452 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -206,6 +206,7 @@ tasks:
     params:
       flags: >-
         -e ARROW_CONAN_PARQUET=True
+        -e ARROW_CONAN_WITH_BROTLI=True
         -e ARROW_CONAN_WITH_JEMALLOC=True
         -e ARROW_CONAN_WITH_LZ4=True
         -e ARROW_CONAN_WITH_SNAPPY=True