You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2019/02/21 04:57:16 UTC

[arrow] branch master updated: ARROW-4639: [CI] Switch off GFLAGS_SHARED for osx

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

kou 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 717328f  ARROW-4639: [CI] Switch off GFLAGS_SHARED for osx
717328f is described below

commit 717328f6aa5fb4a7041c9f8215edd340a20d6f08
Author: Pindikura Ravindra <ra...@dremio.com>
AuthorDate: Thu Feb 21 13:57:04 2019 +0900

    ARROW-4639: [CI] Switch off GFLAGS_SHARED for osx
    
    Author: Pindikura Ravindra <ra...@dremio.com>
    
    Closes #3720 from pravindra/gflags and squashes the following commits:
    
    77373951 <Pindikura Ravindra> ARROW-4639:  Switch off GFLAGS_SHARED for osx
---
 dev/tasks/gandiva-jars/build-cpp.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev/tasks/gandiva-jars/build-cpp.sh b/dev/tasks/gandiva-jars/build-cpp.sh
index 5f0cef3..b585b9d 100755
--- a/dev/tasks/gandiva-jars/build-cpp.sh
+++ b/dev/tasks/gandiva-jars/build-cpp.sh
@@ -25,14 +25,19 @@ source arrow/ci/travis_env_common.sh
 pushd arrow/cpp
   mkdir build
   pushd build
-    cmake -DCMAKE_BUILD_TYPE=Release \
+    CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Release \
           -DARROW_GANDIVA=ON \
           -DARROW_GANDIVA_JAVA=ON \
           -DARROW_GANDIVA_STATIC_LIBSTDCPP=ON \
           -DARROW_BUILD_TESTS=ON \
           -DARROW_BUILD_UTILITIES=OFF \
-          -DARROW_BOOST_USE_SHARED=OFF \
-          ..
+          -DARROW_BOOST_USE_SHARED=OFF"
+
+    if [ $TRAVIS_OS_NAME == "osx" ]; then
+      CMAKE_FLAGS="$CMAKE_FLAGS -DARROW_GFLAGS_USE_SHARED=OFF"
+    fi
+
+    cmake $CMAKE_FLAGS ..
     make -j4
     ctest
   popd