summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-10-05 17:08:39 +0200
committerAlexis Ballier <aballier@gentoo.org>2016-10-05 17:09:25 +0200
commitd06df890c51edeed97d412366e6e9d868808b136 (patch)
treedc4fd82bb03c057c66a570f27415d571a3f48726 /dev-ros
parentdev-ros/rosconsole: remove old (diff)
downloadgentoo-d06df890c51edeed97d412366e6e9d868808b136.tar.gz
gentoo-d06df890c51edeed97d412366e6e9d868808b136.tar.bz2
gentoo-d06df890c51edeed97d412366e6e9d868808b136.zip
dev-ros/rosconsole: fix build with latest boost/gcc6, bug #595818. Patch by Peter Levine.
Package-Manager: portage-2.3.1
Diffstat (limited to 'dev-ros')
-rw-r--r--dev-ros/rosconsole/files/vector.patch20
-rw-r--r--dev-ros/rosconsole/rosconsole-1.12.5.ebuild1
2 files changed, 21 insertions, 0 deletions
diff --git a/dev-ros/rosconsole/files/vector.patch b/dev-ros/rosconsole/files/vector.patch
new file mode 100644
index 000000000000..0b62a883089b
--- /dev/null
+++ b/dev-ros/rosconsole/files/vector.patch
@@ -0,0 +1,20 @@
+commit 74674c49a64abbdcdd5aeea016997af2959c6f05
+Author: Hodorgasm <nsane457@gmail.com>
+Date: Mon Oct 3 20:32:20 2016 -0400
+
+ Add '#Include <vector>' to fix building on GCC-6
+
+ Don't rely on transitive header inclusion to declare std::vector as building with GCC-6 fails due to no '#Include <vector>' statement.
+
+diff --git a/tools/rosconsole/include/ros/console.h b/tools/rosconsole/include/ros/console.h
+index 4d2a86b..28901d7 100644
+--- a/tools/rosconsole/include/ros/console.h
++++ b/tools/rosconsole/include/ros/console.h
+@@ -40,6 +40,7 @@
+ #include <cstdarg>
+ #include <ros/macros.h>
+ #include <map>
++#include <vector>
+
+ #ifdef ROSCONSOLE_BACKEND_LOG4CXX
+ #include "log4cxx/level.h"
diff --git a/dev-ros/rosconsole/rosconsole-1.12.5.ebuild b/dev-ros/rosconsole/rosconsole-1.12.5.ebuild
index 39a48ae9c7ec..a3e85a17bf00 100644
--- a/dev-ros/rosconsole/rosconsole-1.12.5.ebuild
+++ b/dev-ros/rosconsole/rosconsole-1.12.5.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
!log4cxx? ( glog? ( dev-cpp/glog ) )
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/vector.patch" )
src_configure() {
local ROSCONSOLE_BACKEND=""