pulsar-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhai...@apache.org
Subject [incubator-pulsar] branch master updated: Fixed linking of boost and boost-python for osx build (#2302)
Date Fri, 03 Aug 2018 10:31:24 GMT
This is an automated email from the ASF dual-hosted git repository.

zhaijia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 5c2e88c  Fixed linking of boost and boost-python for osx build (#2302)
5c2e88c is described below

commit 5c2e88c3d58c29e75eddc05153abee3e4d53642b
Author: Matteo Merli <mmerli@apache.org>
AuthorDate: Fri Aug 3 19:31:22 2018 +0900

    Fixed linking of boost and boost-python for osx build (#2302)
    
    Build of wheels files in OSX is broken due to failures in finding boost after installing
from brew.
---
 pulsar-client-cpp/python/pkg/osx/build.sh.template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pulsar-client-cpp/python/pkg/osx/build.sh.template b/pulsar-client-cpp/python/pkg/osx/build.sh.template
old mode 100644
new mode 100755
index 5720b27..71687ac
--- a/pulsar-client-cpp/python/pkg/osx/build.sh.template
+++ b/pulsar-client-cpp/python/pkg/osx/build.sh.template
@@ -23,21 +23,29 @@ set -e
 GITTAG=#TAG#
 PYTHONVER=#PYTHONVER#
 
+BOOST_VERSION=1.67
+
 /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
 
-brew install openssl git boost pkg-config jsoncpp cmake protobuf260 log4cxx
+brew install openssl git boost@$BOOST_VERSION pkg-config jsoncpp cmake protobuf260 log4cxx
+
+brew link --force boost@$BOOST_VERSION
 
 if [ "$PYTHONVER" = "PYTHON2" ]
 then
-	brew install python@2 boost-python
+	brew install python@2 boost-python@$BOOST_VERSION
+
+	brew link --force boost-python@$BOOST_VERSION
 fi
 
 if [ "$PYTHONVER" = "PYTHON3" ]
 then
-	brew install python boost-python3
+	brew install python boost-python3@BOOST_VERSION
+	brew link --force boost-python3@$BOOST_VERSION
 fi
 
 brew link --force protobuf260
+
 rm -rf incubator-pulsar
 git clone --depth 1 --branch $GITTAG https://github.com/apache/incubator-pulsar.git
 cd incubator-pulsar/pulsar-client-cpp


Mime
View raw message