| 1 |
commit: d06df890c51edeed97d412366e6e9d868808b136 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 5 15:08:39 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 5 15:09:25 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06df890 |
| 7 |
|
| 8 |
dev-ros/rosconsole: fix build with latest boost/gcc6, bug #595818. Patch by Peter Levine. |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.1 |
| 11 |
|
| 12 |
dev-ros/rosconsole/files/vector.patch | 20 ++++++++++++++++++++ |
| 13 |
dev-ros/rosconsole/rosconsole-1.12.5.ebuild | 1 + |
| 14 |
2 files changed, 21 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-ros/rosconsole/files/vector.patch b/dev-ros/rosconsole/files/vector.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..0b62a88 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-ros/rosconsole/files/vector.patch |
| 21 |
@@ -0,0 +1,20 @@ |
| 22 |
+commit 74674c49a64abbdcdd5aeea016997af2959c6f05 |
| 23 |
+Author: Hodorgasm <nsane457@×××××.com> |
| 24 |
+Date: Mon Oct 3 20:32:20 2016 -0400 |
| 25 |
+ |
| 26 |
+ Add '#Include <vector>' to fix building on GCC-6 |
| 27 |
+ |
| 28 |
+ Don't rely on transitive header inclusion to declare std::vector as building with GCC-6 fails due to no '#Include <vector>' statement. |
| 29 |
+ |
| 30 |
+diff --git a/tools/rosconsole/include/ros/console.h b/tools/rosconsole/include/ros/console.h |
| 31 |
+index 4d2a86b..28901d7 100644 |
| 32 |
+--- a/tools/rosconsole/include/ros/console.h |
| 33 |
++++ b/tools/rosconsole/include/ros/console.h |
| 34 |
+@@ -40,6 +40,7 @@ |
| 35 |
+ #include <cstdarg> |
| 36 |
+ #include <ros/macros.h> |
| 37 |
+ #include <map> |
| 38 |
++#include <vector> |
| 39 |
+ |
| 40 |
+ #ifdef ROSCONSOLE_BACKEND_LOG4CXX |
| 41 |
+ #include "log4cxx/level.h" |
| 42 |
|
| 43 |
diff --git a/dev-ros/rosconsole/rosconsole-1.12.5.ebuild b/dev-ros/rosconsole/rosconsole-1.12.5.ebuild |
| 44 |
index 39a48ae..a3e85a1 100644 |
| 45 |
--- a/dev-ros/rosconsole/rosconsole-1.12.5.ebuild |
| 46 |
+++ b/dev-ros/rosconsole/rosconsole-1.12.5.ebuild |
| 47 |
@@ -24,6 +24,7 @@ RDEPEND=" |
| 48 |
!log4cxx? ( glog? ( dev-cpp/glog ) ) |
| 49 |
" |
| 50 |
DEPEND="${RDEPEND}" |
| 51 |
+PATCHES=( "${FILESDIR}/vector.patch" ) |
| 52 |
|
| 53 |
src_configure() { |
| 54 |
local ROSCONSOLE_BACKEND="" |
Archives