You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2022/08/01 05:30:16 UTC
[arrow] branch master updated: ARROW-17250: [CI][Conan] Enable utf8proc automatically (#13744)
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 42a9b32141 ARROW-17250: [CI][Conan] Enable utf8proc automatically (#13744)
42a9b32141 is described below
commit 42a9b32141c3c5a7178bef6644872d14f3051ce6
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Mon Aug 1 14:30:10 2022 +0900
ARROW-17250: [CI][Conan] Enable utf8proc automatically (#13744)
Authored-by: Sutou Kouhei <ko...@clear-code.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
ci/conan/all/conanfile.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py
index 97acd839cd..110f9bd935 100644
--- a/ci/conan/all/conanfile.py
+++ b/ci/conan/all/conanfile.py
@@ -237,7 +237,7 @@ class ArrowConan(ConanFile):
def _with_utf8proc(self, required=False):
if required or self.options.with_utf8proc == "auto":
- return False
+ return bool(self._compute() or self.options.gandiva)
else:
return bool(self.options.with_utf8proc)
@@ -549,7 +549,7 @@ class ArrowConan(ConanFile):
if self._with_protobuf():
self.cpp_info.components["libarrow"].requires.append("protobuf::protobuf")
if self._with_utf8proc():
- self.cpp_info.components["libarrow"].requires.append("uff8proc::uff8proc")
+ self.cpp_info.components["libarrow"].requires.append("utf8proc::utf8proc")
if self._with_thrift():
self.cpp_info.components["libarrow"].requires.append("thrift::thrift")
if self.options.with_backtrace: