diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-16 19:31:21 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-17 13:40:30 +0000 |
| commit | f2e17a172abbb70a0119a90123b4961bbcf3754f (patch) | |
| tree | 663ed4b3d75960d07295b5d278aa503142d37c24 /testing/ceph/boost-python.patch | |
| parent | 393337cf64c2757c5421dc402cea7cc1eafa7b0c (diff) | |
| download | aports-f2e17a172abbb70a0119a90123b4961bbcf3754f.tar.bz2 aports-f2e17a172abbb70a0119a90123b4961bbcf3754f.tar.xz | |
testing/ceph: build fix for boost 1.67
Diffstat (limited to 'testing/ceph/boost-python.patch')
| -rw-r--r-- | testing/ceph/boost-python.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/testing/ceph/boost-python.patch b/testing/ceph/boost-python.patch new file mode 100644 index 0000000000..77a4402da4 --- /dev/null +++ b/testing/ceph/boost-python.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ebccbee..f9240f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -465,7 +465,7 @@ set(Boost_USE_MULTITHREADED ON) + set(BOOST_COMPONENTS + thread system regex random program_options date_time iostreams) + if(WITH_MGR) +- list(APPEND BOOST_COMPONENTS python) ++ list(APPEND BOOST_COMPONENTS python27) + endif() + + # require minimally the bundled version +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 93963cf..15df5ad 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -596,7 +596,7 @@ if (WITH_MGR) + $<TARGET_OBJECTS:heap_profiler_objs>) + target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}") + target_link_libraries(ceph-mgr mds osdc global +- -lboost_python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) ++ -lboost_python27 ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) + install(TARGETS ceph-mgr DESTINATION bin) + endif (WITH_MGR) + |