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-1432: [C++] Build bundled jemalloc functions with private prefix
Date Wed, 30 Aug 2017 22:14:09 GMT
Repository: arrow
Updated Branches:
  refs/heads/master f45002552 -> 6b391f0d7


ARROW-1432: [C++] Build bundled jemalloc functions with private prefix

Author: Uwe L. Korn <uwelk@xhochy.com>

Closes #1015 from xhochy/ARROW-1432 and squashes the following commits:

8ecebccc [Uwe L. Korn] ARROW-1432: [C++] Build bundled jemalloc functions with private prefix


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

Branch: refs/heads/master
Commit: 6b391f0d7f905da808bf443ac4b30e26ce7e0adc
Parents: f450025
Author: Uwe L. Korn <uwelk@xhochy.com>
Authored: Wed Aug 30 18:14:04 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Wed Aug 30 18:14:04 2017 -0400

----------------------------------------------------------------------
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 2 +-
 python/manylinux1/scripts/build_jemalloc.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/6b391f0d/cpp/cmake_modules/ThirdpartyToolchain.cmake
----------------------------------------------------------------------
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index e5d38b5..194156c 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -466,7 +466,7 @@ if (ARROW_JEMALLOC)
     set(JEMALLOC_VENDORED 1)
     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="
+      CONFIGURE_COMMAND ./configure "--prefix=${JEMALLOC_PREFIX}" "--with-jemalloc-prefix=je_arrow_"
"--with-private-namespace=je_arrow_private_"
       ${EP_LOG_OPTIONS}
       BUILD_IN_SOURCE 1
       BUILD_COMMAND ${MAKE}

http://git-wip-us.apache.org/repos/asf/arrow/blob/6b391f0d/python/manylinux1/scripts/build_jemalloc.sh
----------------------------------------------------------------------
diff --git a/python/manylinux1/scripts/build_jemalloc.sh b/python/manylinux1/scripts/build_jemalloc.sh
index 1bf1a06..5bd4aeb 100755
--- a/python/manylinux1/scripts/build_jemalloc.sh
+++ b/python/manylinux1/scripts/build_jemalloc.sh
@@ -19,7 +19,7 @@
 wget https://github.com/jemalloc/jemalloc/releases/download/4.4.0/jemalloc-4.4.0.tar.bz2
-O jemalloc-4.4.0.tar.bz2
 tar xf jemalloc-4.4.0.tar.bz2
 pushd /jemalloc-4.4.0
-./configure
+./configure "--with-jemalloc-prefix=je_arrow_" "--with-private-namespace=je_arrow_private_"
 make -j5
 make install
 popd


Mime
View raw message