From ef3b3b1e851c89163ab8becc64fcf844967452c0 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Tue, 9 Jan 2024 01:16:11 +0100 Subject: [PATCH 1/3] add -j1 for -GMake --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index 3f327ed64ff..a2627c190f7 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -2040,10 +2040,17 @@ macro(build_jemalloc) # Enable jemalloc debug checks when Arrow itself has debugging enabled list(APPEND JEMALLOC_CONFIGURE_COMMAND "--enable-debug") endif() + set(JEMALLOC_BUILD_COMMAND ${MAKE} ${MAKE_BUILD_ARGS}) + # Paralleism for Make fails with CMake > 3.28 see #39517 + if(${CMAKE_GENERATOR} MATCHES "Makefiles") + list(APPEND JEMALLOC_BUILD_COMMAND "-j1") + endif() + if(CMAKE_OSX_SYSROOT) list(APPEND JEMALLOC_BUILD_COMMAND "SDKROOT=${CMAKE_OSX_SYSROOT}") endif() + externalproject_add(jemalloc_ep ${EP_COMMON_OPTIONS} URL ${JEMALLOC_SOURCE_URL} From 5f6051d4b01471d9cfbb3b2e381288364fb2f9fd Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Tue, 9 Jan 2024 01:16:17 +0100 Subject: [PATCH 2/3] lint --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index a2627c190f7..d88e89ff021 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -446,8 +446,8 @@ endmacro() file(STRINGS "${THIRDPARTY_DIR}/versions.txt" TOOLCHAIN_VERSIONS_TXT) foreach(_VERSION_ENTRY ${TOOLCHAIN_VERSIONS_TXT}) # Exclude comments - if(NOT ((_VERSION_ENTRY MATCHES "^[^#][A-Za-z0-9-_]+_VERSION=") - OR (_VERSION_ENTRY MATCHES "^[^#][A-Za-z0-9-_]+_CHECKSUM="))) + if(NOT ((_VERSION_ENTRY MATCHES "^[^ #][A-Za-z0-9-_]+_VERSION=") + OR (_VERSION_ENTRY MATCHES "^[^ #][A-Za-z0-9-_]+_CHECKSUM="))) continue() endif() From 9be2dfeab4ac8510192a4711a9b21f7163ef8817 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Tue, 9 Jan 2024 03:59:41 +0100 Subject: [PATCH 3/3] Revert "lint" This reverts commit 5f6051d4b01471d9cfbb3b2e381288364fb2f9fd. --- cpp/cmake_modules/ThirdpartyToolchain.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index d88e89ff021..a2627c190f7 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -446,8 +446,8 @@ endmacro() file(STRINGS "${THIRDPARTY_DIR}/versions.txt" TOOLCHAIN_VERSIONS_TXT) foreach(_VERSION_ENTRY ${TOOLCHAIN_VERSIONS_TXT}) # Exclude comments - if(NOT ((_VERSION_ENTRY MATCHES "^[^ #][A-Za-z0-9-_]+_VERSION=") - OR (_VERSION_ENTRY MATCHES "^[^ #][A-Za-z0-9-_]+_CHECKSUM="))) + if(NOT ((_VERSION_ENTRY MATCHES "^[^#][A-Za-z0-9-_]+_VERSION=") + OR (_VERSION_ENTRY MATCHES "^[^#][A-Za-z0-9-_]+_CHECKSUM="))) continue() endif()