Date: Saturday, June 2, 2018 @ 22:58:26
Author: foutrelis
Revision: 338489
Prepare for boost 1.67 rebuild
Added:
ceph/trunk/boost-1.67.patch
Modified:
ceph/trunk/PKGBUILD
------------------+
PKGBUILD | 5 ++---
boost-1.67.patch | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-02 22:39:42 UTC (rev 338488)
+++ PKGBUILD 2018-06-02 22:58:26 UTC (rev 338489)
@@ -23,6 +23,7 @@
source=("https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz";
'ceph.sysusers'
'disable-fail-on-warnings-for-rocksdb.patch'
+ 'boost-1.67.patch'
'fix-ceph_disk-python-interpreter.patch'
'fix-or-disable-broken-tests.patch'
'fix-python2-paths.patch'
@@ -30,6 +31,7 @@
sha512sums=('bd78358590eb077afcc3c1e12864fadee906c95ac8afee25bdca6155f99b75f89d923159fcc13430abba21a89fee3e566177ff5f9ffabdd3b3f220d05602ab86'
'4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
'8991759dd968fa073c5ef37c9a9d4513dded9090db0ba33eed57fae03c9ef497f8f99b0d912a3f9b64cd711fb0185fb60c130e247e6ddfe9ae96f6899c12380a'
+
'dcc9f19b1ce4b080ff1bbebc8c4c7ae9c25ef9275c5f8969bfcfbfe2fb7ed3ce07607ddf865765c8eb41ab77586b284d6ce6d721026d14d90a6dc421a626b222'
'7abd94a333fb0d6c9f7156d69ed6d4bf123f0f3030407f4347209d677b282e5023664d43e74a21a27b7856d3493ae469a17ea8a810331c7266018cc34eee4841'
'89699b0a3d4b7e5f184533a5f658270ca4b942a8af82b106a844c41a652bdb6eaf7cd840c1a4574e88993a8fdedf29c3d066ff22786c5e44122328c77829d107'
'ead2c5fa20cf2e41041f52039acb5fb513922270bdacde234e7ae8e7fd3375ba63e9e3a930a717829577d4d551fa05151c6709a728cb43ef7f930983b38fd762'
@@ -46,9 +48,6 @@
fi
done
- # work around conflict between std::placeholders and boost::placeholders
- sed -i '1i #define BOOST_BIND_NO_PLACEHOLDERS'
src/test/librbd/test_mock_Journal.cc
-
# remove tests that require root privileges
rm src/test/cli/ceph-authtool/cap*.t
Added: boost-1.67.patch
===================================================================
--- boost-1.67.patch (rev 0)
+++ boost-1.67.patch 2018-06-02 22:58:26 UTC (rev 338489)
@@ -0,0 +1,24 @@
+diff -upr ceph-12.2.5.orig/src/rbd_replay/Replayer.cc
ceph-12.2.5/src/rbd_replay/Replayer.cc
+--- ceph-12.2.5.orig/src/rbd_replay/Replayer.cc 2018-04-23
19:18:33.000000000 +0300
++++ ceph-12.2.5/src/rbd_replay/Replayer.cc 2018-06-03 01:55:46.476396645
+0300
+@@ -350,7 +350,7 @@ void Replayer::wait_for_actions(const ac
+ 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((static_cast<long long>(dep.time_delta *
m_latency_multiplier / 1000)));
+ if (sub_release_time > release_time) {
+ release_time = sub_release_time;
+ }
+diff -upr ceph-12.2.5.orig/src/test/librbd/test_mock_Journal.cc
ceph-12.2.5/src/test/librbd/test_mock_Journal.cc
+--- ceph-12.2.5.orig/src/test/librbd/test_mock_Journal.cc 2018-06-03
01:56:35.407273176 +0300
++++ ceph-12.2.5/src/test/librbd/test_mock_Journal.cc 2018-06-03
01:56:29.800506081 +0300
+@@ -1,6 +1,8 @@
+ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+ // vim: ts=8 sw=2 smarttab
+
++#define BOOST_BIND_NO_PLACEHOLDERS
++
+ #include "test/librbd/test_mock_fixture.h"
+ #include "test/journal/mock/MockJournaler.h"
+ #include "test/librbd/test_support.h"
