From commits-return-12750-archive-asf-public=cust-asf.ponee.io@pulsar.incubator.apache.org Tue Aug 14 01:56:27 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 93863180629 for ; Tue, 14 Aug 2018 01:56:26 +0200 (CEST) Received: (qmail 18176 invoked by uid 500); 13 Aug 2018 23:56:25 -0000 Mailing-List: contact commits-help@pulsar.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pulsar.incubator.apache.org Delivered-To: mailing list commits@pulsar.incubator.apache.org Received: (qmail 18166 invoked by uid 99); 13 Aug 2018 23:56:25 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Aug 2018 23:56:25 +0000 From: GitBox To: commits@pulsar.apache.org Subject: [GitHub] hrsakai closed pull request #2366: Fixed linking of python wrapper to boost-python in MacOS build Message-ID: <153420458514.16118.7003457724250053906.gitbox@gitbox.apache.org> Date: Mon, 13 Aug 2018 23:56:25 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit hrsakai closed pull request #2366: Fixed linking of python wrapper to boost-python in MacOS build URL: https://github.com/apache/incubator-pulsar/pull/2366 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/pulsar-client-cpp/python/CMakeLists.txt b/pulsar-client-cpp/python/CMakeLists.txt index 8e70f72ab4..d506844482 100644 --- a/pulsar-client-cpp/python/CMakeLists.txt +++ b/pulsar-client-cpp/python/CMakeLists.txt @@ -35,7 +35,9 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -undefined dynamic_lookup") endif() -set(PYTHON_WRAPPER_LIBS ${Boost_PYTHON_LIBRARY} ${Boost_PYTHON3_LIBRARY}) +# Try all possible boost-python variable namings +set(PYTHON_WRAPPER_LIBS ${Boost_PYTHON_LIBRARY} ${Boost_PYTHON3_LIBRARY} + ${Boost_PYTHON27-MT_LIBRARY} ${Boost_PYTHON37-MT_LIBRARY}) if (APPLE) target_link_libraries(_pulsar -Wl,-all_load pulsarStatic ${PYTHON_WRAPPER_LIBS}) diff --git a/pulsar-client-cpp/python/pkg/osx/build.sh.template b/pulsar-client-cpp/python/pkg/osx/build.sh.template index 71687ac4b4..40b7420de8 100755 --- a/pulsar-client-cpp/python/pkg/osx/build.sh.template +++ b/pulsar-client-cpp/python/pkg/osx/build.sh.template @@ -27,7 +27,7 @@ BOOST_VERSION=1.67 /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" -brew install openssl git boost@$BOOST_VERSION pkg-config jsoncpp cmake protobuf260 log4cxx +brew install openssl git boost@$BOOST_VERSION pkg-config jsoncpp cmake protobuf260 brew link --force boost@$BOOST_VERSION @@ -40,8 +40,8 @@ fi if [ "$PYTHONVER" = "PYTHON3" ] then - brew install python boost-python3@BOOST_VERSION - brew link --force boost-python3@$BOOST_VERSION + brew install python boost-python3 + brew link --force boost-python3 fi brew link --force protobuf260 @@ -52,4 +52,10 @@ cd incubator-pulsar/pulsar-client-cpp cmake . -DBUILD_TESTS=OFF -DLINK_STATIC=ON make _pulsar -j8 cd python -python setup.py bdist_wheel + +if [ "$PYTHONVER" = "PYTHON2" ] +then + python2 setup.py bdist_wheel +else + python3 setup.py bdist_wheel +fi ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org With regards, Apache Git Services