From b29e7cef0cebdfe56aabc126140869ecfe38d413 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Sun, 23 Jun 2019 18:07:11 -0700 Subject: [PATCH 1/5] fix mac wheels build --- dev/tasks/python-wheels/osx-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tasks/python-wheels/osx-build.sh b/dev/tasks/python-wheels/osx-build.sh index be39754e815..28f09c87daa 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 From 089ed845e5c69b2242d96069f3793f71088cec05 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Mon, 24 Jun 2019 17:51:13 -0700 Subject: [PATCH 2/5] hack --- dev/tasks/python-wheels/travis.osx.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/tasks/python-wheels/travis.osx.yml b/dev/tasks/python-wheels/travis.osx.yml index ac58cd822ec..2d32042590c 100644 --- a/dev/tasks/python-wheels/travis.osx.yml +++ b/dev/tasks/python-wheels/travis.osx.yml @@ -48,6 +48,7 @@ before_install: - brew update - brew upgrade cmake - brew install bison flex grpc openssl llvm@7 + - rm /usr/local/opt/grpc/lib/*.dylib - export CONFIG_PATH=`pwd`/arrow/dev/tasks/python-wheels/osx-build.sh - source multibuild/common_utils.sh From 93e2e711eca89adc31f261d4d3e6b6639d829a27 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Mon, 24 Jun 2019 18:07:15 -0700 Subject: [PATCH 3/5] update --- dev/tasks/python-wheels/travis.osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/python-wheels/travis.osx.yml b/dev/tasks/python-wheels/travis.osx.yml index 2d32042590c..4a8f082828d 100644 --- a/dev/tasks/python-wheels/travis.osx.yml +++ b/dev/tasks/python-wheels/travis.osx.yml @@ -48,7 +48,7 @@ before_install: - brew update - brew upgrade cmake - brew install bison flex grpc openssl llvm@7 - - rm /usr/local/opt/grpc/lib/*.dylib + - 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 From dbdb85db044142db85259077d609778257d89747 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Mon, 24 Jun 2019 19:21:20 -0700 Subject: [PATCH 4/5] update --- dev/tasks/python-wheels/travis.osx.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev/tasks/python-wheels/travis.osx.yml b/dev/tasks/python-wheels/travis.osx.yml index 4a8f082828d..b8ba5797541 100644 --- a/dev/tasks/python-wheels/travis.osx.yml +++ b/dev/tasks/python-wheels/travis.osx.yml @@ -48,6 +48,8 @@ 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 that static ones. - rm -f /usr/local/opt/grpc/lib/*.dylib - export CONFIG_PATH=`pwd`/arrow/dev/tasks/python-wheels/osx-build.sh @@ -64,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 it links statically - brew uninstall llvm@7 + - brew uninstall grpc - install_run arrow # move built wheels to a top level directory From d8e6410d6fa7325c9c69cf7f96e313b0f85c7219 Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Mon, 24 Jun 2019 20:01:20 -0700 Subject: [PATCH 5/5] update --- dev/tasks/python-wheels/travis.osx.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tasks/python-wheels/travis.osx.yml b/dev/tasks/python-wheels/travis.osx.yml index b8ba5797541..5ac96f3c7d1 100644 --- a/dev/tasks/python-wheels/travis.osx.yml +++ b/dev/tasks/python-wheels/travis.osx.yml @@ -49,7 +49,7 @@ before_install: - 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 that static ones. + # 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 @@ -66,7 +66,7 @@ install: # the following functions are defined in osx-build.sh - build_wheel arrow - # test the built wheels, remove llvm and grpc 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