From 54a33f103f7144882416ce66c20b4e27858b3ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Mon, 16 Aug 2021 15:30:44 +0200 Subject: [PATCH] Define --with-lg-page for jemalloc in the arm manylinux builds --- ci/scripts/python_wheel_manylinux_build.sh | 5 +++++ cpp/cmake_modules/ThirdpartyToolchain.cmake | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ci/scripts/python_wheel_manylinux_build.sh b/ci/scripts/python_wheel_manylinux_build.sh index 312e1c3b9b7cd..67814288f5e4c 100755 --- a/ci/scripts/python_wheel_manylinux_build.sh +++ b/ci/scripts/python_wheel_manylinux_build.sh @@ -71,6 +71,10 @@ echo "=== (${PYTHON_VERSION}) Building Arrow C++ libraries ===" : ${VCPKG_FEATURE_FLAGS:=-manifests} : ${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}} +if [[ "$(uname -m)" == arm* ]] || [[ "$(uname -m)" == aarch* ]]; then + export ARROW_EXTRA_CMAKE_FLAGS="-DARROW_JEMALLOC_LG_PAGE=14" +fi + mkdir /tmp/arrow-build pushd /tmp/arrow-build cmake \ @@ -109,6 +113,7 @@ cmake \ -DOPENSSL_USE_STATIC_LIBS=ON \ -DVCPKG_MANIFEST_MODE=OFF \ -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET} \ + ${ARROW_EXTRA_CMAKE_FLAGS} \ -G ${CMAKE_GENERATOR} \ /arrow/cpp cmake --build . --target install diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 0631d277b08eb..2f18165a8be1f 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -1502,6 +1502,9 @@ if(ARROW_JEMALLOC) if(CMAKE_OSX_SYSROOT) list(APPEND JEMALLOC_CONFIGURE_COMMAND "SDKROOT=${CMAKE_OSX_SYSROOT}") endif() + if(DEFINED ARROW_JEMALLOC_LG_PAGE) + list(APPEND JEMALLOC_CONFIGURE_COMMAND "--with-lg-page=${ARROW_JEMALLOC_LG_PAGE}") + endif() list(APPEND JEMALLOC_CONFIGURE_COMMAND "--prefix=${JEMALLOC_PREFIX}"