testing/ceph: build fix for boost 1.67

3 files changed, 202 insertions, 7 deletions

diff --git a/testing/ceph/APKBUILD b/testing/ceph/APKBUILD
index 0a4facc340..4e55fa287c 100644
--- a/testing/ceph/APKBUILD
+++ b/testing/ceph/APKBUILD
@@ -10,6 +10,7 @@ url="http://ceph.com"
 arch="x86_64"
 license="LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT"
 depends="ceph-osd ceph-mds ceph-mon"
+options="!checkroot"
 makedepends="
 	acl-dev
 	argp-standalone
@@ -63,6 +64,8 @@ makedepends="
 "
 
 source="http://download.ceph.com/tarballs/ceph_$pkgver.orig.tar.gz
+	boost-python.patch
+	boost-1.67.patch
 	allperms.patch"
 subpackages="
 	$pkgname-base
@@ -75,7 +78,6 @@ subpackages="
 	$pkgname-osd
 	$pkgname-doc
 	$pkgname-bash-completion:bash_completion
-	$pkgname-test:ceph_test
 	rbd-fuse:rbd_fuse
 	rbd-mirror:rbd_mirror
 	rbd-nbd:rbd_nbd
@@ -133,16 +135,12 @@ build() {
 		-DWITH_PYTHON3=OFF \
 		-DWITH_LTTNG=OFF \
 		-DWITH_SYSTEM_BOOST=ON \
-		-DWITH_EMBEDDED=OFF
+		-DWITH_EMBEDDED=OFF \
+		-DWITH_TESTS=OFF
 	make
 
 }
 
-check() {
-	cd "$builddir"/build
-	ctest
-}
-
 package() {
 	cd "$builddir"/build
 	make DESTDIR="$pkgdir" install
@@ -165,6 +163,11 @@ package() {
 		"$pkgdir"$_udevrulesdir/95-ceph-osd.rules
 }
 
+check() {
+	cd "$builddir"/build
+	ctest
+}
+
 base() {
 	pkgdesc="Base is the package that includes all the files shared amongst ceph servers"
 	depends="
@@ -473,4 +476,6 @@ _pkg() {
 }
 
 sha512sums="9c1c6d211bfc1e5f59e3f0115c09c7f2d8a279eda6ac9ad4b5d3533fe7c6a43d983b20a60a2597fa1340bc94521fb44125c276f18ae9870bc08ff0b02d842a1d  ceph_11.1.1.orig.tar.gz
+f75b359eb35f0eb7314ed5d05c118aea8894469edb67437189c0cdeadbf28b7ec5c937d8a08da2783871e09014aab7ad039ddf7d0d18148deec10a7407389b0e  boost-python.patch
+56ad2fa4433ffcb1d672762646d0dead5c8d73bf1d2770e01f1ca144b83140348d3e2020476017b0b785cf47cdb5242f0ed1ad30fe81eb5ea5fbb5ec2a799f0d  boost-1.67.patch
 e1becd813ed3f28e2e4a6bef78b3b5117c1c0bb9cabe0ba9c912e0a20b551b6b2667495cddb94acd64192e287144911ff1c11e0d636fe04cc458146cfb0daca8  allperms.patch"
diff --git a/testing/ceph/boost-1.67.patch b/testing/ceph/boost-1.67.patch
new file mode 100644
index 0000000000..ea342ca675
--- /dev/null
+++ b/testing/ceph/boost-1.67.patch
@@ -0,0 +1,164 @@
+diff --git a/src/rbd_replay/Replayer.cc b/src/rbd_replay/Replayer.cc
+index ea0f9a0..8d15378 100644
+--- a/src/rbd_replay/Replayer.cc
++++ b/src/rbd_replay/Replayer.cc
+@@ -339,7 +339,7 @@ void Replayer::wait_for_actions(const action::Dependencies &deps) {
+     dout(DEPGRAPH_LEVEL) << "Finished waiting for " << dep.id << " after " << micros << " microseconds" << dendl;
+     // Apparently the nanoseconds constructor is optional:
+     // http://www.boost.org/doc/libs/1_46_0/doc/html/date_time/details.html#compile_options
+-    boost::system_time sub_release_time(action_completed_time + boost::posix_time::microseconds(dep.time_delta * m_latency_multiplier / 1000));
++    boost::system_time sub_release_time(action_completed_time + boost::posix_time::microseconds(long(dep.time_delta * m_latency_multiplier / 1000)));
+     if (sub_release_time > release_time) {
+       release_time = sub_release_time;
+     }
+diff --git a/src/test/librbd/test_mock_Journal.cc b/src/test/librbd/test_mock_Journal.cc
+index ced44da..82926dc 100644
+--- a/src/test/librbd/test_mock_Journal.cc
++++ b/src/test/librbd/test_mock_Journal.cc
+@@ -465,7 +465,7 @@ public:
+     expect_get_max_append_size(mock_journaler, 1 << 16);
+     expect_start_replay(
+       mock_image_ctx, mock_journaler,
+-      std::bind(&invoke_replay_complete, _1, 0));
++      std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
+ 
+     MockJournalReplay mock_journal_replay;
+     expect_stop_replay(mock_journaler);
+@@ -513,7 +513,7 @@ TEST_F(TestMockJournal, StateTransitions) {
+   expect_get_max_append_size(mock_journaler, 1 << 16);
+   expect_start_replay(
+     mock_image_ctx, mock_journaler,
+-    std::bind(&invoke_replay_ready, _1));
++    std::bind(&invoke_replay_ready, std::placeholders::_1));
+ 
+   ::journal::MockReplayEntry mock_replay_entry;
+   MockJournalReplay mock_journal_replay;
+@@ -522,11 +522,11 @@ TEST_F(TestMockJournal, StateTransitions) {
+   expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry);
+   expect_replay_process(mock_journal_replay);
+   expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry,
+-                       std::bind(&invoke_replay_ready, _1));
++                       std::bind(&invoke_replay_ready, std::placeholders::_1));
+   expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry);
+   expect_replay_process(mock_journal_replay);
+   expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry,
+-                       std::bind(&invoke_replay_complete, _1, 0));
++                       std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
+ 
+   expect_stop_replay(mock_journaler);
+   expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
+@@ -582,7 +582,7 @@ TEST_F(TestMockJournal, ReplayCompleteError) {
+   expect_get_max_append_size(mock_journaler, 1 << 16);
+   expect_start_replay(
+     mock_image_ctx, mock_journaler,
+-    std::bind(&invoke_replay_complete, _1, -EINVAL));
++    std::bind(&invoke_replay_complete, std::placeholders::_1, -EINVAL));
+ 
+   MockJournalReplay mock_journal_replay;
+   expect_stop_replay(mock_journaler);
+@@ -596,7 +596,7 @@ TEST_F(TestMockJournal, ReplayCompleteError) {
+   expect_get_max_append_size(mock_journaler, 1 << 16);
+   expect_start_replay(
+     mock_image_ctx, mock_journaler,
+-    std::bind(&invoke_replay_complete, _1, 0));
++    std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
+ 
+   expect_stop_replay(mock_journaler);
+   expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
+@@ -628,14 +628,14 @@ TEST_F(TestMockJournal, FlushReplayError) {
+   expect_get_max_append_size(mock_journaler, 1 << 16);
+   expect_start_replay(
+     mock_image_ctx, mock_journaler,
+-    std::bind(&invoke_replay_ready, _1));
++    std::bind(&invoke_replay_ready, std::placeholders::_1));
+ 
+   ::journal::MockReplayEntry mock_replay_entry;
+   MockJournalReplay mock_journal_replay;
+   expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry);
+   expect_replay_process(mock_journal_replay);
+   expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry,
+-                       std::bind(&invoke_replay_complete, _1, 0));
++                       std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
+   expect_stop_replay(mock_journaler);
+   expect_shut_down_replay(mock_image_ctx, mock_journal_replay, -EINVAL);
+   expect_shut_down_journaler(mock_journaler);
+@@ -647,7 +647,7 @@ TEST_F(TestMockJournal, FlushReplayError) {
+   expect_get_max_append_size(mock_journaler, 1 << 16);
+   expect_start_replay(
+     mock_image_ctx, mock_journaler,
+-    std::bind(&invoke_replay_complete, _1, 0));
++    std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
+ 
+   expect_stop_replay(mock_journaler);
+   expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
+@@ -679,7 +679,7 @@ TEST_F(TestMockJournal, CorruptEntry) {
+   expect_get_max_append_size(mock_journaler, 1 << 16);
+   expect_start_replay(
+     mock_image_ctx, mock_journaler,
+-    std::bind(&invoke_replay_ready, _1));
++    std::bind(&invoke_replay_ready, std::placeholders::_1));
+ 
+   ::journal::MockReplayEntry mock_replay_entry;
+   MockJournalReplay mock_journal_replay;
+@@ -696,7 +696,7 @@ TEST_F(TestMockJournal, CorruptEntry) {
+   expect_get_max_append_size(mock_journaler, 1 << 16);
+   expect_start_replay(
+     mock_image_ctx, mock_journaler,
+-    std::bind(&invoke_replay_complete, _1, 0));
++    std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
+   expect_stop_replay(mock_journaler);
+   expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
+   expect_start_append(mock_journaler);
+@@ -727,7 +727,7 @@ TEST_F(TestMockJournal, StopError) {
+   expect_get_max_append_size(mock_journaler, 1 << 16);
+   expect_start_replay(
+     mock_image_ctx, mock_journaler,
+-    std::bind(&invoke_replay_complete, _1, 0));
++    std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
+ 
+   MockJournalReplay mock_journal_replay;
+   expect_stop_replay(mock_journaler);
+@@ -760,7 +760,7 @@ TEST_F(TestMockJournal, ReplayOnDiskPreFlushError) {
+ 
+   expect_start_replay(
+     mock_image_ctx, mock_journaler,
+-    std::bind(&invoke_replay_ready, _1));
++    std::bind(&invoke_replay_ready, std::placeholders::_1));
+ 
+   ::journal::MockReplayEntry mock_replay_entry;
+   MockJournalReplay mock_journal_replay;
+@@ -786,7 +786,7 @@ TEST_F(TestMockJournal, ReplayOnDiskPreFlushError) {
+   expect_get_max_append_size(mock_journaler, 1 << 16);
+   expect_start_replay(
+     mock_image_ctx, mock_journaler, {
+-      std::bind(&invoke_replay_complete, _1, 0)
++      std::bind(&invoke_replay_complete, std::placeholders::_1, 0)
+     });
+ 
+   expect_stop_replay(mock_journaler);
+@@ -840,14 +840,14 @@ TEST_F(TestMockJournal, ReplayOnDiskPostFlushError) {
+   expect_get_max_append_size(mock_journaler, 1 << 16);
+   expect_start_replay(
+     mock_image_ctx, mock_journaler,
+-    std::bind(&invoke_replay_ready, _1));
++    std::bind(&invoke_replay_ready, std::placeholders::_1));
+ 
+   ::journal::MockReplayEntry mock_replay_entry;
+   MockJournalReplay mock_journal_replay;
+   expect_try_pop_front(mock_image_ctx, mock_journaler, true, mock_replay_entry);
+   expect_replay_process(mock_journal_replay);
+   expect_try_pop_front(mock_image_ctx, mock_journaler, false, mock_replay_entry,
+-                       std::bind(&invoke_replay_complete, _1, 0));
++                       std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
+   expect_stop_replay(mock_journaler);
+ 
+   Context *on_flush = nullptr;
+@@ -863,7 +863,7 @@ TEST_F(TestMockJournal, ReplayOnDiskPostFlushError) {
+   expect_get_max_append_size(mock_journaler, 1 << 16);
+   expect_start_replay(
+     mock_image_ctx, mock_journaler,
+-    std::bind(&invoke_replay_complete, _1, 0));
++    std::bind(&invoke_replay_complete, std::placeholders::_1, 0));
+ 
+   expect_stop_replay(mock_journaler);
+   expect_shut_down_replay(mock_image_ctx, mock_journal_replay, 0);
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)
+