From e8803b82d929f37a2e72de5b6f66722404327e5e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Mar 2017 15:18:45 +0200 Subject: [PATCH 1/3] ARROW-739: Don't install jemalloc in parallel --- cpp/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index c77cf601cbd..fc6d6b1d766 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -629,13 +629,15 @@ if (ARROW_JEMALLOC) CONFIGURE_COMMAND ./configure "--prefix=${JEMALLOC_PREFIX}" "--with-jemalloc-prefix=" BUILD_IN_SOURCE 1 BUILD_COMMAND ${MAKE} - BUILD_BYPRODUCTS "${JEMALLOC_STATIC_LIB}" "${JEMALLOC_SHARED_LIB}") + BUILD_BYPRODUCTS "${JEMALLOC_STATIC_LIB}" "${JEMALLOC_SHARED_LIB}" + INSTALL_COMMAND ${MAKE} -j1) else() ExternalProject_Add(jemalloc_ep URL https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2 CONFIGURE_COMMAND ./configure "--prefix=${JEMALLOC_PREFIX}" "--with-jemalloc-prefix=" BUILD_IN_SOURCE 1 - BUILD_COMMAND ${MAKE}) + BUILD_COMMAND ${MAKE} + INSTALL_COMMAND ${MAKE} -j1) endif() else() set(JEMALLOC_VENDORED 0) From f121072998c5934e93678892e715efac45e38a87 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Thu, 30 Mar 2017 16:34:46 +0200 Subject: [PATCH 2/3] Add install to install command --- cpp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index fc6d6b1d766..8254110a43e 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -630,14 +630,14 @@ if (ARROW_JEMALLOC) BUILD_IN_SOURCE 1 BUILD_COMMAND ${MAKE} BUILD_BYPRODUCTS "${JEMALLOC_STATIC_LIB}" "${JEMALLOC_SHARED_LIB}" - INSTALL_COMMAND ${MAKE} -j1) + INSTALL_COMMAND ${MAKE} -j1 install) else() ExternalProject_Add(jemalloc_ep URL https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2 CONFIGURE_COMMAND ./configure "--prefix=${JEMALLOC_PREFIX}" "--with-jemalloc-prefix=" BUILD_IN_SOURCE 1 BUILD_COMMAND ${MAKE} - INSTALL_COMMAND ${MAKE} -j1) + INSTALL_COMMAND ${MAKE} -j1 install) endif() else() set(JEMALLOC_VENDORED 0) From c1cad567aca42c7bf9af1a0fe01c538f830d1ac1 Mon Sep 17 00:00:00 2001 From: Robert Nishihara Date: Thu, 30 Mar 2017 19:26:10 -0700 Subject: [PATCH 3/3] Replace MAKE -> CMAKE_MAKE_PROGRAM in CMakeLists.txt. --- cpp/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 8254110a43e..d065fb44efb 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -628,16 +628,16 @@ if (ARROW_JEMALLOC) URL https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2 CONFIGURE_COMMAND ./configure "--prefix=${JEMALLOC_PREFIX}" "--with-jemalloc-prefix=" BUILD_IN_SOURCE 1 - BUILD_COMMAND ${MAKE} + BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} BUILD_BYPRODUCTS "${JEMALLOC_STATIC_LIB}" "${JEMALLOC_SHARED_LIB}" - INSTALL_COMMAND ${MAKE} -j1 install) + INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} -j1 install) else() ExternalProject_Add(jemalloc_ep URL https://github.com/jemalloc/jemalloc/releases/download/${JEMALLOC_VERSION}/jemalloc-${JEMALLOC_VERSION}.tar.bz2 CONFIGURE_COMMAND ./configure "--prefix=${JEMALLOC_PREFIX}" "--with-jemalloc-prefix=" BUILD_IN_SOURCE 1 - BUILD_COMMAND ${MAKE} - INSTALL_COMMAND ${MAKE} -j1 install) + BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} + INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} -j1 install) endif() else() set(JEMALLOC_VENDORED 0)