Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions recipes/arrow/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"21.0.0":
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-21.0.0/apache-arrow-21.0.0.tar.gz?action=download"
sha256: "5d3f8db7e72fb9f65f4785b7a1634522e8d8e9657a445af53d4a34a3849857b5"
"20.0.0":
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-20.0.0/apache-arrow-20.0.0.tar.gz?action=download"
sha256: "89efbbf852f5a1f79e9c99ab4c217e2eb7f991837c005cba2d4a2fbd35fad212"
Expand All @@ -24,6 +27,10 @@ sources:
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.2/apache-arrow-14.0.2.tar.gz?action=download"
sha256: "1304dedb41896008b89fe0738c71a95d9b81752efc77fa70f264cb1da15d9bc2"
patches:
"21.0.0":
- patch_file: "patches/21.0.0-0001-fix-downloaded-mimalloc.patch"
patch_description: "use cci package"
patch_type: "conan"
"20.0.0":
- patch_file: "patches/20.0.0-0001-fix-downloaded-mimalloc.patch"
patch_description: "use cci package"
Expand Down
3 changes: 2 additions & 1 deletion recipes/arrow/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ def layout(self):
cmake_layout(self, src_folder="src")

def _requires_rapidjson(self):
return self.options.with_json or self.options.encryption
return (self.options.with_json or self.options.encryption or
(Version(self.version) >= "21.0.0" and self.options.parquet))

def requirements(self):
if self.options.with_thrift:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 7fa4b66..f81c831 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -2230,6 +2230,10 @@ endif()
# mimalloc - Cross-platform high-performance allocator, from Microsoft

if(ARROW_MIMALLOC)
+ find_package(mimalloc REQUIRED CONFIG)
+endif()
+
+if(0)
if(NOT ARROW_ENABLE_THREADING)
message(FATAL_ERROR "Can't use mimalloc with ARROW_ENABLE_THREADING=OFF")
endif()
2 changes: 2 additions & 0 deletions recipes/arrow/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"21.0.0":
folder: all
"20.0.0":
folder: all
"19.0.1":
Expand Down