You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ap...@apache.org on 2024/01/23 10:21:04 UTC
(arrow) branch main updated: MINOR: Revert "GH-39628: [C++] Use -j1 for cmake >= 3.28" (#39736)
This is an automated email from the ASF dual-hosted git repository.
apitrou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 015c2d676f MINOR: Revert "GH-39628: [C++] Use -j1 for cmake >= 3.28" (#39736)
015c2d676f is described below
commit 015c2d676f62477aca29fdd244988ea13b331814
Author: Antoine Pitrou <an...@python.org>
AuthorDate: Tue Jan 23 11:20:57 2024 +0100
MINOR: Revert "GH-39628: [C++] Use -j1 for cmake >= 3.28" (#39736)
Revert apache/arrow#39629: it makes all builds using CMake >= 3.28 much slower, while only addressing a very specific build failure. Hopefully we can find a more targeted workaround.
Authored-by: Antoine Pitrou <pi...@free.fr>
Signed-off-by: Antoine Pitrou <an...@python.org>
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 1f5cd3a2b4..6bb9c0f6af 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -1005,13 +1005,8 @@ if("${MAKE}" STREQUAL "")
endif()
endif()
-# Args for external projects using make
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.28")
- # Prevent 'bad file descriptor' error see #39517 #39628
- set(MAKE_BUILD_ARGS "-j1")
-else()
- set(MAKE_BUILD_ARGS "-j${NPROC}")
-endif()
+# Args for external projects using make.
+set(MAKE_BUILD_ARGS "-j${NPROC}")
include(FetchContent)
set(FC_DECLARE_COMMON_OPTIONS)
@@ -2639,7 +2634,7 @@ macro(build_bzip2)
BUILD_IN_SOURCE 1
BUILD_COMMAND ${MAKE} libbz2.a ${MAKE_BUILD_ARGS}
${BZIP2_EXTRA_ARGS}
- INSTALL_COMMAND ${MAKE} install -j1 PREFIX=${BZIP2_PREFIX}
+ INSTALL_COMMAND ${MAKE} install PREFIX=${BZIP2_PREFIX}
${BZIP2_EXTRA_ARGS}
INSTALL_DIR ${BZIP2_PREFIX}
URL ${ARROW_BZIP2_SOURCE_URL}