[arrow] branch master updated: ARROW-4831: [C++] CMAKE_AR is not passed to ZSTD thirdparty dependency

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 0c4f857  ARROW-4831: [C++] CMAKE_AR is not passed to ZSTD thirdparty dependency
0c4f857 is described below

commit 0c4f857e89b82369eb57ee9296c3ecd7a39f8850
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Wed Mar 13 12:15:38 2019 -0500

    ARROW-4831: [C++] CMAKE_AR is not passed to ZSTD thirdparty dependency
    
    Test it via docker.
    
    1. Start an interactive shell in the conda container:
    
    ```bash
    docker run -it --rm -v /local/path/to/arrow:/arrow ursalab/amd64-ubuntu-18.04-conda-python-3.6:worker bash
    ```
    
    2. Execute the following build from `/arrow` withing the container:
    
    ```bash
    export ARROW_BUILD_TYPE=debug
    export ARROW_BUILD_TOOLCHAIN=$CONDA_PREFIX
    export ARROW_HOME=$CONDA_PREFIX
    export PARQUET_HOME=$CONDA_PREFIX
    export PYARROW_CMAKE_GENERATOR=Ninja
    
    mkdir -p cpp/build
    pushd cpp/build
    
    cmake -GNinja \
          -DCMAKE_BUILD_TYPE=$ARROW_BUILD_TYPE \
          -DCMAKE_INSTALL_PREFIX=$ARROW_HOME \
          -DARROW_PYTHON=ON \
          -DCMAKE_AR=${AR} \
          -DCMAKE_RANLIB=${RANLIB} \
          ..
    ninja
    ninja install
    
    popd
    
    pushd python
    
    python setup.py build_ext --inplace --build-type=$ARROW_BUILD_TYPE
    py.test -sv pyarrow
    
    popd
    ```
    
    Author: Krisztián Szűcs <sz...@gmail.com>
    
    Closes #3885 from kszucs/ARROW-4831 and squashes the following commits:
    
    e97e34962 <Krisztián Szűcs> pass CMAKE_AR to ZSTD thirdparty
---
 cpp/cmake_modules/ThirdpartyToolchain.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 9a8f503..50a7e97 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -1209,8 +1209,9 @@ if (ARROW_WITH_ZSTD)
     set(ZSTD_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/zstd_ep-install")
     set(ZSTD_INCLUDE_DIR "${ZSTD_PREFIX}/include")
 
-    set(ZSTD_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    set(ZSTD_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
       "-DCMAKE_INSTALL_PREFIX=${ZSTD_PREFIX}"
+      -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
       -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
       -DZSTD_BUILD_PROGRAMS=off
       -DZSTD_BUILD_SHARED=off