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