Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/build-wheel-inside-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
set -e -x

cd /pulsar-client-python
ROOT_DIR=$PWD
source build-support/dep-url.sh

# Build cpp wheels
Expand All @@ -46,6 +47,9 @@ if [ $CPP_BINARY_TYPE == "rpm" ]; then
cd ..
./bootstrap-vcpkg.sh
cd ..
if [ $PULSAR_CPP_VERSION == "3.7.0" ]; then
patch lib/CMakeLists.txt $ROOT_DIR/pkg/manylinux2014/pulsar-client-cpp-3.7.0.patch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For next versions, should we just fix this in cpp repo build file? At least add a build option

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I pushed a PR here: apache/pulsar-client-cpp#474

fi
cmake -B build-cpp -DINTEGRATE_VCPKG=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_DYNAMIC_LIB=ON -DBUILD_STATIC_LIB=ON
cmake --build build-cpp -j8 --target install
cd ..
Expand Down
13 changes: 13 additions & 0 deletions pkg/manylinux2014/pulsar-client-cpp-3.7.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- lib/CMakeLists.txt
+++ lib/CMakeLists.txt
@@ -93,10 +93,6 @@
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_link_options(pulsarShared PRIVATE -Wl,-Bsymbolic)
endif ()
- check_cxx_symbol_exists(__GLIBCXX__ iostream GLIBCXX)
- if (GLIBCXX)
- target_link_libraries(pulsarShared PUBLIC -static-libgcc -static-libstdc++)
- endif ()
endif()

check_cxx_symbol_exists(getauxval sys/auxv.h HAVE_AUXV_GETAUXVAL)