[arrow] branch master updated: ARROW-5690: [Packaging][Python] Fix macOS wheel building

[wesm]

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 c48bc1a  ARROW-5690: [Packaging][Python] Fix macOS wheel building
c48bc1a is described below

commit c48bc1a6b1c9e11d76d1dd4d3cdf23544b716237
Author: Philipp Moritz <pcmor...@gmail.com>
AuthorDate: Tue Jun 25 14:15:01 2019 -0500

    ARROW-5690: [Packaging][Python] Fix macOS wheel building
    
    This fixes the macOS wheels for me. There should be a better way to make 
the linking against grpc static, let me know if you have any ideas (any flags 
in CMake that could be set?).
    
    Author: Philipp Moritz <pcmor...@gmail.com>
    
    Closes #4685 from pcmoritz/fix-mac-wheels and squashes the following 
commits:
    
    d8e6410d6 <Philipp Moritz> update
    dbdb85db0 <Philipp Moritz> update
    93e2e711e <Philipp Moritz> update
    089ed845e <Philipp Moritz> hack
    b29e7cef0 <Philipp Moritz> fix mac wheels build
---
 dev/tasks/python-wheels/osx-build.sh   | 1 +
 dev/tasks/python-wheels/travis.osx.yml | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev/tasks/python-wheels/osx-build.sh 
b/dev/tasks/python-wheels/osx-build.sh
index be39754..28f09c8 100755
--- a/dev/tasks/python-wheels/osx-build.sh
+++ b/dev/tasks/python-wheels/osx-build.sh
@@ -136,6 +136,7 @@ function build_wheel {
           -DBoost_NAMESPACE=arrow_boost \
           -DARROW_FLIGHT=ON \
           -DgRPC_SOURCE=SYSTEM \
+          -DARROW_PROTOBUF_USE_SHARED=OFF \
           -DMAKE=make \
           ..
     make -j5
diff --git a/dev/tasks/python-wheels/travis.osx.yml 
b/dev/tasks/python-wheels/travis.osx.yml
index ac58cd8..5ac96f3 100644
--- a/dev/tasks/python-wheels/travis.osx.yml
+++ b/dev/tasks/python-wheels/travis.osx.yml
@@ -48,6 +48,9 @@ before_install:
   - brew update
   - brew upgrade cmake
   - brew install bison flex grpc openssl llvm@7
+  # Remove shared grpc libraries installed by brew to make sure
+  # we are linked against the static ones.
+  - rm -f /usr/local/opt/grpc/lib/*.dylib
 
   - export CONFIG_PATH=`pwd`/arrow/dev/tasks/python-wheels/osx-build.sh
   - source multibuild/common_utils.sh
@@ -63,8 +66,9 @@ install:
   # the following functions are defined in osx-build.sh
   - build_wheel arrow
 
-  # test the built wheels, remove llvm to ensure it links statically
+  # test the built wheels, remove llvm and grpc to ensure they link statically
   - brew uninstall llvm@7
+  - brew uninstall grpc
   - install_run arrow
 
   # move built wheels to a top level directory