| 1 |
commit: a483eb034cafe5d1c17cb37bf7017c8c7f5f8df6 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 13 12:21:54 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 13 14:07:14 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a483eb03 |
| 7 |
|
| 8 |
dev-ros/roscpp: fix build with boost 1.73 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ros/roscpp/files/boost173.patch | 62 +++++++++++++++++++++++++++++++++++++ |
| 14 |
dev-ros/roscpp/roscpp-1.15.4.ebuild | 1 + |
| 15 |
dev-ros/roscpp/roscpp-9999.ebuild | 1 + |
| 16 |
3 files changed, 64 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-ros/roscpp/files/boost173.patch b/dev-ros/roscpp/files/boost173.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..d31f8c8ff24 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-ros/roscpp/files/boost173.patch |
| 23 |
@@ -0,0 +1,62 @@ |
| 24 |
+Index: roscpp/include/ros/timer_manager.h |
| 25 |
+=================================================================== |
| 26 |
+--- roscpp.orig/include/ros/timer_manager.h |
| 27 |
++++ roscpp/include/ros/timer_manager.h |
| 28 |
+@@ -349,7 +349,7 @@ int32_t TimerManager<T, D, E>::add(const |
| 29 |
+ { |
| 30 |
+ boost::mutex::scoped_lock lock(waiting_mutex_); |
| 31 |
+ waiting_.push_back(info->handle); |
| 32 |
+- waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2)); |
| 33 |
++ waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2)); |
| 34 |
+ } |
| 35 |
+ |
| 36 |
+ new_timer_ = true; |
| 37 |
+@@ -416,7 +416,7 @@ void TimerManager<T, D, E>::schedule(con |
| 38 |
+ |
| 39 |
+ waiting_.push_back(info->handle); |
| 40 |
+ // waitingCompare requires a lock on the timers_mutex_ |
| 41 |
+- waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2)); |
| 42 |
++ waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2)); |
| 43 |
+ } |
| 44 |
+ |
| 45 |
+ new_timer_ = true; |
| 46 |
+@@ -490,7 +490,7 @@ void TimerManager<T, D, E>::setPeriod(in |
| 47 |
+ // In this case, let next_expected be updated only in updateNext |
| 48 |
+ |
| 49 |
+ info->period = period; |
| 50 |
+- waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2)); |
| 51 |
++ waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2)); |
| 52 |
+ } |
| 53 |
+ |
| 54 |
+ new_timer_ = true; |
| 55 |
+Index: roscpp/src/libros/connection_manager.cpp |
| 56 |
+=================================================================== |
| 57 |
+--- roscpp.orig/src/libros/connection_manager.cpp |
| 58 |
++++ roscpp/src/libros/connection_manager.cpp |
| 59 |
+@@ -66,7 +66,7 @@ void ConnectionManager::start() |
| 60 |
+ tcpserver_transport_ = boost::make_shared<TransportTCP>(&poll_manager_->getPollSet()); |
| 61 |
+ if (!tcpserver_transport_->listen(network::getTCPROSPort(), |
| 62 |
+ MAX_TCPROS_CONN_QUEUE, |
| 63 |
+- boost::bind(&ConnectionManager::tcprosAcceptConnection, this, _1))) |
| 64 |
++ boost::bind(&ConnectionManager::tcprosAcceptConnection, this, boost::placeholders::_1))) |
| 65 |
+ { |
| 66 |
+ ROS_FATAL("Listen on port [%d] failed", network::getTCPROSPort()); |
| 67 |
+ ROS_BREAK(); |
| 68 |
+@@ -142,7 +142,7 @@ void ConnectionManager::addConnection(co |
| 69 |
+ boost::mutex::scoped_lock lock(connections_mutex_); |
| 70 |
+ |
| 71 |
+ connections_.insert(conn); |
| 72 |
+- conn->addDropListener(boost::bind(&ConnectionManager::onConnectionDropped, this, _1)); |
| 73 |
++ conn->addDropListener(boost::bind(&ConnectionManager::onConnectionDropped, this, boost::placeholders::_1)); |
| 74 |
+ } |
| 75 |
+ |
| 76 |
+ void ConnectionManager::onConnectionDropped(const ConnectionPtr& conn) |
| 77 |
+@@ -190,7 +190,7 @@ void ConnectionManager::tcprosAcceptConn |
| 78 |
+ ConnectionPtr conn(boost::make_shared<Connection>()); |
| 79 |
+ addConnection(conn); |
| 80 |
+ |
| 81 |
+- conn->initialize(transport, true, boost::bind(&ConnectionManager::onConnectionHeaderReceived, this, _1, _2)); |
| 82 |
++ conn->initialize(transport, true, boost::bind(&ConnectionManager::onConnectionHeaderReceived, this, boost::placeholders::_1, boost::placeholders::_2)); |
| 83 |
+ } |
| 84 |
+ |
| 85 |
+ bool ConnectionManager::onConnectionHeaderReceived(const ConnectionPtr& conn, const Header& header) |
| 86 |
|
| 87 |
diff --git a/dev-ros/roscpp/roscpp-1.15.4.ebuild b/dev-ros/roscpp/roscpp-1.15.4.ebuild |
| 88 |
index 033a2eb87fd..8863bf3d38b 100644 |
| 89 |
--- a/dev-ros/roscpp/roscpp-1.15.4.ebuild |
| 90 |
+++ b/dev-ros/roscpp/roscpp-1.15.4.ebuild |
| 91 |
@@ -27,3 +27,4 @@ RDEPEND=" |
| 92 |
dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
| 93 |
" |
| 94 |
DEPEND="${RDEPEND}" |
| 95 |
+PATCHES=( "${FILESDIR}/boost173.patch" ) |
| 96 |
|
| 97 |
diff --git a/dev-ros/roscpp/roscpp-9999.ebuild b/dev-ros/roscpp/roscpp-9999.ebuild |
| 98 |
index 033a2eb87fd..8863bf3d38b 100644 |
| 99 |
--- a/dev-ros/roscpp/roscpp-9999.ebuild |
| 100 |
+++ b/dev-ros/roscpp/roscpp-9999.ebuild |
| 101 |
@@ -27,3 +27,4 @@ RDEPEND=" |
| 102 |
dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
| 103 |
" |
| 104 |
DEPEND="${RDEPEND}" |
| 105 |
+PATCHES=( "${FILESDIR}/boost173.patch" ) |
Archives