| 1 |
commit: 6d4d943f8d65590ceaecc0f706b08f70bc59231b |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 27 09:20:33 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 27 09:34:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4d943f |
| 7 |
|
| 8 |
dev-ros/laser_cb_detector: Fix build with gcc6. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-ros/laser_cb_detector/files/gcc6.patch | 13 +++++++++++++ |
| 13 |
dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild | 3 ++- |
| 14 |
dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild | 3 ++- |
| 15 |
3 files changed, 17 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ros/laser_cb_detector/files/gcc6.patch b/dev-ros/laser_cb_detector/files/gcc6.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000..6580ca5 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-ros/laser_cb_detector/files/gcc6.patch |
| 22 |
@@ -0,0 +1,13 @@ |
| 23 |
+Index: laser_cb_detector/CMakeLists.txt |
| 24 |
+=================================================================== |
| 25 |
+--- laser_cb_detector.orig/CMakeLists.txt |
| 26 |
++++ laser_cb_detector/CMakeLists.txt |
| 27 |
+@@ -15,7 +15,7 @@ catkin_package(DEPENDS actionlib actionl |
| 28 |
+ ) |
| 29 |
+ |
| 30 |
+ find_package(OpenCV REQUIRED) |
| 31 |
+-include_directories(SYSTEM ${catkin_INCLUDE_DIRS} |
| 32 |
++include_directories(${catkin_INCLUDE_DIRS} |
| 33 |
+ ${OpenCV_INCLUDE_DIRS} |
| 34 |
+ ) |
| 35 |
+ include_directories(include) |
| 36 |
|
| 37 |
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild |
| 38 |
index 6cecd27..ccd9c34 100644 |
| 39 |
--- a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild |
| 40 |
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild |
| 41 |
@@ -1,4 +1,4 @@ |
| 42 |
-# Copyright 1999-2014 Gentoo Foundation |
| 43 |
+# Copyright 1999-2017 Gentoo Foundation |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
# $Id$ |
| 46 |
|
| 47 |
@@ -27,3 +27,4 @@ RDEPEND=" |
| 48 |
dev-ros/settlerlib |
| 49 |
" |
| 50 |
DEPEND="${RDEPEND}" |
| 51 |
+PATCHES=( "${FILESDIR}/gcc6.patch" ) |
| 52 |
|
| 53 |
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild |
| 54 |
index 6cecd27..ccd9c34 100644 |
| 55 |
--- a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild |
| 56 |
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild |
| 57 |
@@ -1,4 +1,4 @@ |
| 58 |
-# Copyright 1999-2014 Gentoo Foundation |
| 59 |
+# Copyright 1999-2017 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
# $Id$ |
| 62 |
|
| 63 |
@@ -27,3 +27,4 @@ RDEPEND=" |
| 64 |
dev-ros/settlerlib |
| 65 |
" |
| 66 |
DEPEND="${RDEPEND}" |
| 67 |
+PATCHES=( "${FILESDIR}/gcc6.patch" ) |
Archives