Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4AB92200CF8 for ; Thu, 31 Aug 2017 00:14:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4978D16A1E4; Wed, 30 Aug 2017 22:14:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 90B9B16A1E3 for ; Thu, 31 Aug 2017 00:14:11 +0200 (CEST) Received: (qmail 64866 invoked by uid 500); 30 Aug 2017 22:14:09 -0000 Mailing-List: contact commits-help@arrow.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@arrow.apache.org Delivered-To: mailing list commits@arrow.apache.org Received: (qmail 64857 invoked by uid 99); 30 Aug 2017 22:14:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Aug 2017 22:14:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2A055E115A; Wed, 30 Aug 2017 22:14:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: wesm@apache.org To: commits@arrow.apache.org Message-Id: <6ad7fad31cb74f2cad171aabea908572@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?arrow_git_commit=3A_ARROW-1432=3A_=5BC++=5D=C2=A0Build_b?= =?utf-8?q?undled_jemalloc_functions_with_private_prefix?= Date: Wed, 30 Aug 2017 22:14:09 +0000 (UTC) archived-at: Wed, 30 Aug 2017 22:14:12 -0000 Repository: arrow Updated Branches: refs/heads/master f45002552 -> 6b391f0d7 ARROW-1432: [C++] Build bundled jemalloc functions with private prefix Author: Uwe L. Korn 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 Authored: Wed Aug 30 18:14:04 2017 -0400 Committer: Wes McKinney 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