| 1 |
commit: 8a72cd8531e1e94b51a8971cae0db6bbe2203dba |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 24 10:17:21 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 24 10:36:56 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a72cd85 |
| 7 |
|
| 8 |
dev-ros/monocam_settler: Fix build with gcc6. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-ros/monocam_settler/files/gcc6.patch | 22 ++++++++++++++++++++++ |
| 13 |
.../monocam_settler/monocam_settler-0.10.14.ebuild | 3 ++- |
| 14 |
2 files changed, 24 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-ros/monocam_settler/files/gcc6.patch b/dev-ros/monocam_settler/files/gcc6.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..35c84d1 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-ros/monocam_settler/files/gcc6.patch |
| 21 |
@@ -0,0 +1,22 @@ |
| 22 |
+Index: monocam_settler/CMakeLists.txt |
| 23 |
+=================================================================== |
| 24 |
+--- monocam_settler.orig/CMakeLists.txt |
| 25 |
++++ monocam_settler/CMakeLists.txt |
| 26 |
+@@ -16,7 +16,7 @@ catkin_package(DEPENDS actionlib actionl |
| 27 |
+ ) |
| 28 |
+ |
| 29 |
+ |
| 30 |
+-include_directories(SYSTEM ${catkin_INCLUDE_DIRS}) |
| 31 |
++include_directories(${catkin_INCLUDE_DIRS}) |
| 32 |
+ include_directories(include) |
| 33 |
+ |
| 34 |
+ # deal with the include |
| 35 |
+@@ -33,7 +33,7 @@ install(TARGETS ${PROJECT_NAME} |
| 36 |
+ ) |
| 37 |
+ |
| 38 |
+ # deal with the executable |
| 39 |
+-include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) |
| 40 |
++include_directories(${Boost_INCLUDE_DIRS}) |
| 41 |
+ add_executable(monocam_settler_action src/monocam_settler_action.cpp) |
| 42 |
+ target_link_libraries(monocam_settler_action ${Boost_LIBRARIES} |
| 43 |
+ ${catkin_LIBRARIES} |
| 44 |
|
| 45 |
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild |
| 46 |
index b413582..2352f5e 100644 |
| 47 |
--- a/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild |
| 48 |
+++ b/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild |
| 49 |
@@ -1,4 +1,4 @@ |
| 50 |
-# Copyright 1999-2014 Gentoo Foundation |
| 51 |
+# Copyright 1999-2017 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Id$ |
| 54 |
|
| 55 |
@@ -26,3 +26,4 @@ RDEPEND=" |
| 56 |
" |
| 57 |
DEPEND="${RDEPEND} |
| 58 |
test? ( dev-cpp/gtest )" |
| 59 |
+PATCHES=( "${FILESDIR}/gcc6.patch" ) |
Archives