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