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 644c0edb63 ARROW-16731: [C++] Bump version of vendored mimalloc
(#13295)
644c0edb63 is described below
commit 644c0edb63181d5602ea2a6fa5d30006c4c5789c
Author: Antoine Pitrou <[email protected]>
AuthorDate: Fri Jun 3 01:11:56 2022 +0200
ARROW-16731: [C++] Bump version of vendored mimalloc (#13295)
The 2.0 line should probably be stable enough now.
Lead-authored-by: Antoine Pitrou <[email protected]>
Co-authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 6 ++++--
cpp/thirdparty/versions.txt | 6 ++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 6fed574619..48f6ee9a5e 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -1880,14 +1880,16 @@ if(ARROW_MIMALLOC)
endif()
set(MIMALLOC_PREFIX
"${CMAKE_CURRENT_BINARY_DIR}/mimalloc_ep/src/mimalloc_ep")
- set(MIMALLOC_INCLUDE_DIR "${MIMALLOC_PREFIX}/include/mimalloc-1.7")
+ set(MIMALLOC_INCLUDE_DIR "${MIMALLOC_PREFIX}/include/mimalloc-2.0")
set(MIMALLOC_STATIC_LIB
-
"${MIMALLOC_PREFIX}/lib/mimalloc-1.7/${CMAKE_STATIC_LIBRARY_PREFIX}${MIMALLOC_LIB_BASE_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+
"${MIMALLOC_PREFIX}/lib/mimalloc-2.0/${CMAKE_STATIC_LIBRARY_PREFIX}${MIMALLOC_LIB_BASE_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
)
+ # Override CMAKE_INSTALL_LIBDIR to avoid lib64 installation on RedHat
derivatives
set(MIMALLOC_CMAKE_ARGS
${EP_COMMON_CMAKE_ARGS}
"-DCMAKE_INSTALL_PREFIX=${MIMALLOC_PREFIX}"
+ "-DCMAKE_INSTALL_LIBDIR=lib"
-DMI_OVERRIDE=OFF
-DMI_LOCAL_DYNAMIC_TLS=ON
-DMI_BUILD_OBJECT=OFF
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index 5fad409391..08f81808db 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -60,10 +60,8 @@
ARROW_JEMALLOC_BUILD_SHA256_CHECKSUM=2db82d1e7119df3e71b7640219b6dfe84789bc05379
# Include post-1.9.3 fixes for undefined behaviour
ARROW_LZ4_BUILD_VERSION=8f61d8eb7c6979769a484cde8df61ff7c4c77765
ARROW_LZ4_BUILD_SHA256_CHECKSUM=5b072d848f2f93fddb97e1143e22c1bd7fa19fc8431ee69e21758190a88125b4
-# mimalloc 1.6.7 didn't build on Visual Studio 2015
-# https://github.com/microsoft/mimalloc/issues/353
-ARROW_MIMALLOC_BUILD_VERSION=v1.7.3
-ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=0f987bda01ca9df87ec90e9d98c63fa893ee61f3cca565e5ca5ed744fdcc5109
+ARROW_MIMALLOC_BUILD_VERSION=v2.0.6
+ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=9f05c94cc2b017ed13698834ac2a3567b6339a8bde27640df5a1581d49d05ce5
ARROW_NLOHMANN_JSON_BUILD_VERSION=v3.10.2
ARROW_NLOHMANN_JSON_BUILD_SHA256_CHECKSUM=081ed0f9f89805c2d96335c3acfa993b39a0a5b4b4cef7edb68dd2210a13458c
ARROW_OPENTELEMETRY_BUILD_VERSION=v1.3.0
