Repository: arrow Updated Branches: refs/heads/master af83c4519 -> 9f500aff8
ARROW-1170: C++: Link to pthread on ARROW_JEMALLOC=OFF Also test this on Travis. Author: Uwe L. Korn <uw...@xhochy.com> Closes #798 from xhochy/ARROW-1170 and squashes the following commits: f247422 [Uwe L. Korn] C++: Link to pthread on ARROW_JEMALLOC=OFF Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/9f500aff Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/9f500aff Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/9f500aff Branch: refs/heads/master Commit: 9f500aff84f59db073ec68b52592a0821a79797c Parents: af83c45 Author: Uwe L. Korn <uw...@xhochy.com> Authored: Fri Jun 30 11:35:52 2017 +0200 Committer: Uwe L. Korn <uw...@xhochy.com> Committed: Fri Jun 30 11:35:52 2017 +0200 ---------------------------------------------------------------------- ci/travis_before_script_cpp.sh | 3 +++ cpp/CMakeLists.txt | 3 +++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/9f500aff/ci/travis_before_script_cpp.sh ---------------------------------------------------------------------- diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh index 36966da..e250e70 100755 --- a/ci/travis_before_script_cpp.sh +++ b/ci/travis_before_script_cpp.sh @@ -56,8 +56,11 @@ $CMAKE_COMMON_FLAGS \ -DARROW_BUILD_TESTS=OFF \ -DARROW_BUILD_UTILITIES=OFF" else + # Deactivate jemalloc on Linux builds. We check the jemalloc+Linux build + # also in the manylinux1 image. CMAKE_LINUX_FLAGS="\ $CMAKE_LINUX_FLAGS \ +-DARROW_JEMALLOC=ON \ -DARROW_TEST_MEMCHECK=ON" fi http://git-wip-us.apache.org/repos/asf/arrow/blob/9f500aff/cpp/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 1d1ffbe..5745338 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -616,6 +616,9 @@ elseif (NOT MSVC) set(ARROW_LINK_LIBS ${ARROW_LINK_LIBS} ${PTHREAD_LIBRARY}) + set(ARROW_STATIC_LINK_LIBS + ${ARROW_STATIC_LINK_LIBS} + ${PTHREAD_LIBRARY}) endif() ############################################################
