arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-739: Don't install jemalloc in parallel
Date Fri, 31 Mar 2017 14:30:14 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 005826f80 -> ad8a0cfec


ARROW-739: Don't install jemalloc in parallel

Alternative fix proposal. Couldn't trigger it locally though.

Author: Uwe L. Korn <uwelk@xhochy.com>
Author: Robert Nishihara <robertnishihara@gmail.com>

Closes #456 from xhochy/ARROW-739 and squashes the following commits:

c1cad56 [Robert Nishihara] Replace MAKE -> CMAKE_MAKE_PROGRAM in CMakeLists.txt.
f121072 [Uwe L. Korn] Add install to install command
e8803b8 [Uwe L. Korn] ARROW-739: Don't install jemalloc in parallel


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/ad8a0cfe
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/ad8a0cfe
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/ad8a0cfe

Branch: refs/heads/master
Commit: ad8a0cfeced7f86e21fcaa63de3e55ce42b8f962
Parents: 005826f
Author: Uwe L. Korn <uwelk@xhochy.com>
Authored: Fri Mar 31 10:30:08 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Fri Mar 31 10:30:08 2017 -0400

----------------------------------------------------------------------
 cpp/CMakeLists.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/ad8a0cfe/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index aa8ea31..5dcf58c 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -637,14 +637,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_BYPRODUCTS "${JEMALLOC_STATIC_LIB}" "${JEMALLOC_SHARED_LIB}")
+        BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
+        BUILD_BYPRODUCTS "${JEMALLOC_STATIC_LIB}" "${JEMALLOC_SHARED_LIB}"
+        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})
+        BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
+        INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} -j1 install)
     endif()
   else()
     set(JEMALLOC_VENDORED 0)


Mime
View raw message