1 |
commit: cc716230890e07a3aae7628a12e53f4cc1bfc0b0 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 23 12:18:39 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 23 12:28:11 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc716230 |
7 |
|
8 |
dev-ros/stereo_image_proc: Backport upstream patch to build with gcc6. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-ros/stereo_image_proc/files/gcc6.patch | 33 ++++++++++++++++++++++ |
13 |
.../stereo_image_proc-1.12.19-r1.ebuild | 3 +- |
14 |
2 files changed, 35 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/dev-ros/stereo_image_proc/files/gcc6.patch b/dev-ros/stereo_image_proc/files/gcc6.patch |
17 |
new file mode 100644 |
18 |
index 00000000..ee4dfda |
19 |
--- /dev/null |
20 |
+++ b/dev-ros/stereo_image_proc/files/gcc6.patch |
21 |
@@ -0,0 +1,33 @@ |
22 |
+commit 6c2d65452bd5fe62723988a1a570789921900d59 |
23 |
+Author: Lukas Bulwahn <lukas.bulwahn@×××××××××××××.de> |
24 |
+Date: Fri Sep 30 15:39:47 2016 +0200 |
25 |
+ |
26 |
+ address gcc6 build error |
27 |
+ |
28 |
+ With gcc6, compiling fails with `stdlib.h: No such file or directory`, |
29 |
+ as including '-isystem /usr/include' breaks with gcc6, cf., |
30 |
+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129. |
31 |
+ |
32 |
+ This commit addresses this issue for this package in the same way |
33 |
+ it was addressed in various other ROS packages. A list of related |
34 |
+ commits and pull requests is at: |
35 |
+ |
36 |
+ https://github.com/ros/rosdistro/issues/12783 |
37 |
+ |
38 |
+ Signed-off-by: Lukas Bulwahn <lukas.bulwahn@×××××××××××××.de> |
39 |
+ |
40 |
+diff --git a/stereo_image_proc/CMakeLists.txt b/stereo_image_proc/CMakeLists.txt |
41 |
+index b7127d2..e201436 100644 |
42 |
+--- a/stereo_image_proc/CMakeLists.txt |
43 |
++++ b/stereo_image_proc/CMakeLists.txt |
44 |
+@@ -16,9 +16,7 @@ catkin_package( |
45 |
+ include_directories(include) |
46 |
+ |
47 |
+ find_package(OpenCV REQUIRED) |
48 |
+-include_directories(SYSTEM ${catkin_INCLUDE_DIRS} |
49 |
+- ${OpenCV_INCLUDE_DIRS} |
50 |
+-) |
51 |
++include_directories(${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS}) |
52 |
+ |
53 |
+ # Nodelet library |
54 |
+ add_library(${PROJECT_NAME} src/libstereo_image_proc/processor.cpp src/nodelets/disparity.cpp src/nodelets/point_cloud2.cpp) |
55 |
|
56 |
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.19-r1.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.19-r1.ebuild |
57 |
index a180aaa..b01571e 100644 |
58 |
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.19-r1.ebuild |
59 |
+++ b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.19-r1.ebuild |
60 |
@@ -1,4 +1,4 @@ |
61 |
-# Copyright 1999-2016 Gentoo Foundation |
62 |
+# Copyright 1999-2017 Gentoo Foundation |
63 |
# Distributed under the terms of the GNU General Public License v2 |
64 |
# $Id$ |
65 |
|
66 |
@@ -29,3 +29,4 @@ RDEPEND=" |
67 |
dev-libs/boost:=[threads] |
68 |
" |
69 |
DEPEND="${RDEPEND}" |
70 |
+PATCHES=( "${FILESDIR}/gcc6.patch" ) |